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/14 16:46:05 UTC
svn commit: r1782988 -
/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/
Author: coheigea
Date: Tue Feb 14 16:46:04 2017
New Revision: 1782988
URL: http://svn.apache.org/viewvc?rev=1782988&view=rev
Log:
Fixing JDK 7 compilation problems on 2_1_x
Modified:
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecuredParts.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Attachments.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/KeyValueToken.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/RelToken.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SamlToken.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SecureConversationToken.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SecurityContextToken.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SignedParts.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SpnegoContextToken.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Trust10.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Trust13.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/UsernameToken.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Wss10.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Wss11.java
webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java Tue Feb 14 16:46:04 2017
@@ -88,7 +88,7 @@ public abstract class AbstractBinding ex
if (layout != null) {
result = 31 * result + layout.hashCode();
}
- result = 31 * result + Boolean.hashCode(includeTimestamp);
+ result = 31 * result + Boolean.valueOf(includeTimestamp).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecuredParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecuredParts.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecuredParts.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecuredParts.java Tue Feb 14 16:46:04 2017
@@ -71,7 +71,7 @@ public abstract class AbstractSecuredPar
if (attachments != null) {
result = 31 * result + attachments.hashCode();
}
- result = 31 * result + Boolean.hashCode(body);
+ result = 31 * result + Boolean.valueOf(body).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java Tue Feb 14 16:46:04 2017
@@ -104,8 +104,8 @@ public abstract class AbstractSecurityAs
if (version != null) {
result = 31 * result + version.hashCode();
}
- result = 31 * result + Boolean.hashCode(isOptional);
- result = 31 * result + Boolean.hashCode(isIgnorable);
+ result = 31 * result + Boolean.valueOf(isOptional).hashCode();
+ result = 31 * result + Boolean.valueOf(isIgnorable).hashCode();
return result;
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java Tue Feb 14 16:46:04 2017
@@ -83,9 +83,9 @@ public abstract class AbstractSymmetricA
if (protectionOrder != null) {
result = 31 * result + protectionOrder.hashCode();
}
- result = 31 * result + Boolean.hashCode(encryptSignature);
- result = 31 * result + Boolean.hashCode(protectTokens);
- result = 31 * result + Boolean.hashCode(onlySignEntireHeadersAndBody);
+ result = 31 * result + Boolean.valueOf(encryptSignature).hashCode();
+ result = 31 * result + Boolean.valueOf(protectTokens).hashCode();
+ result = 31 * result + Boolean.valueOf(onlySignEntireHeadersAndBody).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java Tue Feb 14 16:46:04 2017
@@ -350,12 +350,12 @@ public class AlgorithmSuite extends Abst
result = 31 * result + signatureKeyDerivation.hashCode();
}
- result = 31 * result + Integer.hashCode(encryptionDerivedKeyLength);
- result = 31 * result + Integer.hashCode(signatureDerivedKeyLength);
- result = 31 * result + Integer.hashCode(minimumSymmetricKeyLength);
- result = 31 * result + Integer.hashCode(maximumSymmetricKeyLength);
- result = 31 * result + Integer.hashCode(minimumAsymmetricKeyLength);
- result = 31 * result + Integer.hashCode(maximumAsymmetricKeyLength);
+ result = 31 * result + Integer.valueOf(encryptionDerivedKeyLength).hashCode();
+ result = 31 * result + Integer.valueOf(signatureDerivedKeyLength).hashCode();
+ result = 31 * result + Integer.valueOf(minimumSymmetricKeyLength).hashCode();
+ result = 31 * result + Integer.valueOf(maximumSymmetricKeyLength).hashCode();
+ result = 31 * result + Integer.valueOf(minimumAsymmetricKeyLength).hashCode();
+ result = 31 * result + Integer.valueOf(maximumAsymmetricKeyLength).hashCode();
if (mgfAlgo != null) {
result = 31 * result + mgfAlgo.hashCode();
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Attachments.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Attachments.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Attachments.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Attachments.java Tue Feb 14 16:46:04 2017
@@ -68,8 +68,8 @@ public class Attachments extends Abstrac
@Override
public int hashCode() {
int result = 17;
- result = 31 * result + Boolean.hashCode(contentSignatureTransform);
- result = 31 * result + Boolean.hashCode(attachmentCompleteSignatureTransform);
+ result = 31 * result + Boolean.valueOf(contentSignatureTransform).hashCode();
+ result = 31 * result + Boolean.valueOf(attachmentCompleteSignatureTransform).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java Tue Feb 14 16:46:04 2017
@@ -86,8 +86,8 @@ public class IssuedToken extends Abstrac
if (requestSecurityTokenTemplate != null) {
result = 31 * result + DOM2Writer.nodeToString(requestSecurityTokenTemplate).hashCode();
}
- result = 31 * result + Boolean.hashCode(requireExternalReference);
- result = 31 * result + Boolean.hashCode(requireInternalReference);
+ result = 31 * result + Boolean.valueOf(requireExternalReference).hashCode();
+ result = 31 * result + Boolean.valueOf(requireInternalReference).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java Tue Feb 14 16:46:04 2017
@@ -87,7 +87,7 @@ public class KerberosToken extends Abstr
if (apReqTokenType != null) {
result = 31 * result + apReqTokenType.hashCode();
}
- result = 31 * result + Boolean.hashCode(requireKeyIdentifierReference);
+ result = 31 * result + Boolean.valueOf(requireKeyIdentifierReference).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/KeyValueToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/KeyValueToken.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/KeyValueToken.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/KeyValueToken.java Tue Feb 14 16:46:04 2017
@@ -63,7 +63,7 @@ public class KeyValueToken extends Abstr
@Override
public int hashCode() {
int result = 17;
- result = 31 * result + Boolean.hashCode(rsaKeyValue);
+ result = 31 * result + Boolean.valueOf(rsaKeyValue).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/RelToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/RelToken.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/RelToken.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/RelToken.java Tue Feb 14 16:46:04 2017
@@ -88,7 +88,7 @@ public class RelToken extends AbstractTo
if (relTokenType != null) {
result = 31 * result + relTokenType.hashCode();
}
- result = 31 * result + Boolean.hashCode(requireKeyIdentifierReference);
+ result = 31 * result + Boolean.valueOf(requireKeyIdentifierReference).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SamlToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SamlToken.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SamlToken.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SamlToken.java Tue Feb 14 16:46:04 2017
@@ -89,7 +89,7 @@ public class SamlToken extends AbstractT
if (samlTokenType != null) {
result = 31 * result + samlTokenType.hashCode();
}
- result = 31 * result + Boolean.hashCode(requireKeyIdentifierReference);
+ result = 31 * result + Boolean.valueOf(requireKeyIdentifierReference).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SecureConversationToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SecureConversationToken.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SecureConversationToken.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SecureConversationToken.java Tue Feb 14 16:46:04 2017
@@ -69,9 +69,9 @@ public class SecureConversationToken ext
@Override
public int hashCode() {
int result = 17;
- result = 31 * result + Boolean.hashCode(mustNotSendCancel);
- result = 31 * result + Boolean.hashCode(mustNotSendAmend);
- result = 31 * result + Boolean.hashCode(mustNotSendRenew);
+ result = 31 * result + Boolean.valueOf(mustNotSendCancel).hashCode();
+ result = 31 * result + Boolean.valueOf(mustNotSendAmend).hashCode();
+ result = 31 * result + Boolean.valueOf(mustNotSendRenew).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SecurityContextToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SecurityContextToken.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SecurityContextToken.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SecurityContextToken.java Tue Feb 14 16:46:04 2017
@@ -67,9 +67,9 @@ public class SecurityContextToken extend
@Override
public int hashCode() {
int result = 17;
- result = 31 * result + Boolean.hashCode(requireExternalUriReference);
- result = 31 * result + Boolean.hashCode(sc13SecurityContextToken);
- result = 31 * result + Boolean.hashCode(sc10SecurityContextToken);
+ result = 31 * result + Boolean.valueOf(requireExternalUriReference).hashCode();
+ result = 31 * result + Boolean.valueOf(sc13SecurityContextToken).hashCode();
+ result = 31 * result + Boolean.valueOf(sc10SecurityContextToken).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SignedParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SignedParts.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SignedParts.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SignedParts.java Tue Feb 14 16:46:04 2017
@@ -60,7 +60,7 @@ public class SignedParts extends Abstrac
@Override
public int hashCode() {
int result = 17;
- result = 31 * result + Boolean.hashCode(signAllHeaders);
+ result = 31 * result + Boolean.valueOf(signAllHeaders).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SpnegoContextToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SpnegoContextToken.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SpnegoContextToken.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/SpnegoContextToken.java Tue Feb 14 16:46:04 2017
@@ -67,9 +67,9 @@ public class SpnegoContextToken extends
@Override
public int hashCode() {
int result = 17;
- result = 31 * result + Boolean.hashCode(mustNotSendCancel);
- result = 31 * result + Boolean.hashCode(mustNotSendAmend);
- result = 31 * result + Boolean.hashCode(mustNotSendRenew);
+ result = 31 * result + Boolean.valueOf(mustNotSendCancel).hashCode();
+ result = 31 * result + Boolean.valueOf(mustNotSendAmend).hashCode();
+ result = 31 * result + Boolean.valueOf(mustNotSendRenew).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Trust10.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Trust10.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Trust10.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Trust10.java Tue Feb 14 16:46:04 2017
@@ -80,11 +80,11 @@ public class Trust10 extends AbstractSec
@Override
public int hashCode() {
int result = 17;
- result = 31 * result + Boolean.hashCode(mustSupportClientChallenge);
- result = 31 * result + Boolean.hashCode(mustSupportServerChallenge);
- result = 31 * result + Boolean.hashCode(requireClientEntropy);
- result = 31 * result + Boolean.hashCode(requireServerEntropy);
- result = 31 * result + Boolean.hashCode(mustSupportIssuedTokens);
+ result = 31 * result + Boolean.valueOf(mustSupportClientChallenge).hashCode();
+ result = 31 * result + Boolean.valueOf(mustSupportServerChallenge).hashCode();
+ result = 31 * result + Boolean.valueOf(requireClientEntropy).hashCode();
+ result = 31 * result + Boolean.valueOf(requireServerEntropy).hashCode();
+ result = 31 * result + Boolean.valueOf(mustSupportIssuedTokens).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Trust13.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Trust13.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Trust13.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Trust13.java Tue Feb 14 16:46:04 2017
@@ -68,10 +68,10 @@ public class Trust13 extends Trust10 {
@Override
public int hashCode() {
int result = 17;
- result = 31 * result + Boolean.hashCode(requireRequestSecurityTokenCollection);
- result = 31 * result + Boolean.hashCode(requireAppliesTo);
- result = 31 * result + Boolean.hashCode(scopePolicy15);
- result = 31 * result + Boolean.hashCode(mustSupportInteractiveChallenge);
+ result = 31 * result + Boolean.valueOf(requireRequestSecurityTokenCollection).hashCode();
+ result = 31 * result + Boolean.valueOf(requireAppliesTo).hashCode();
+ result = 31 * result + Boolean.valueOf(scopePolicy15).hashCode();
+ result = 31 * result + Boolean.valueOf(mustSupportInteractiveChallenge).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/UsernameToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/UsernameToken.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/UsernameToken.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/UsernameToken.java Tue Feb 14 16:46:04 2017
@@ -108,8 +108,8 @@ public class UsernameToken extends Abstr
if (usernameTokenType != null) {
result = 31 * result + usernameTokenType.hashCode();
}
- result = 31 * result + Boolean.hashCode(created);
- result = 31 * result + Boolean.hashCode(nonce);
+ result = 31 * result + Boolean.valueOf(created).hashCode();
+ result = 31 * result + Boolean.valueOf(nonce).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Wss10.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Wss10.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Wss10.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Wss10.java Tue Feb 14 16:46:04 2017
@@ -78,10 +78,10 @@ public class Wss10 extends AbstractSecur
@Override
public int hashCode() {
int result = 17;
- result = 31 * result + Boolean.hashCode(mustSupportRefKeyIdentifier);
- result = 31 * result + Boolean.hashCode(mustSupportRefIssuerSerial);
- result = 31 * result + Boolean.hashCode(mustSupportRefExternalURI);
- result = 31 * result + Boolean.hashCode(mustSupportRefEmbeddedToken);
+ result = 31 * result + Boolean.valueOf(mustSupportRefKeyIdentifier).hashCode();
+ result = 31 * result + Boolean.valueOf(mustSupportRefIssuerSerial).hashCode();
+ result = 31 * result + Boolean.valueOf(mustSupportRefExternalURI).hashCode();
+ result = 31 * result + Boolean.valueOf(mustSupportRefEmbeddedToken).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Wss11.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Wss11.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Wss11.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/Wss11.java Tue Feb 14 16:46:04 2017
@@ -65,9 +65,9 @@ public class Wss11 extends Wss10 {
@Override
public int hashCode() {
int result = 17;
- result = 31 * result + Boolean.hashCode(mustSupportRefThumbprint);
- result = 31 * result + Boolean.hashCode(mustSupportRefEncryptedKey);
- result = 31 * result + Boolean.hashCode(requireSignatureConfirmation);
+ result = 31 * result + Boolean.valueOf(mustSupportRefThumbprint).hashCode();
+ result = 31 * result + Boolean.valueOf(mustSupportRefEncryptedKey).hashCode();
+ result = 31 * result + Boolean.valueOf(requireSignatureConfirmation).hashCode();
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java?rev=1782988&r1=1782987&r2=1782988&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java Tue Feb 14 16:46:04 2017
@@ -101,10 +101,10 @@ public class X509Token extends AbstractT
if (tokenType != null) {
result = 31 * result + tokenType.hashCode();
}
- result = 31 * result + Boolean.hashCode(requireKeyIdentifierReference);
- result = 31 * result + Boolean.hashCode(requireIssuerSerialReference);
- result = 31 * result + Boolean.hashCode(requireEmbeddedTokenReference);
- result = 31 * result + Boolean.hashCode(requireThumbprintReference);
+ result = 31 * result + Boolean.valueOf(requireKeyIdentifierReference).hashCode();
+ result = 31 * result + Boolean.valueOf(requireIssuerSerialReference).hashCode();
+ result = 31 * result + Boolean.valueOf(requireEmbeddedTokenReference).hashCode();
+ result = 31 * result + Boolean.valueOf(requireThumbprintReference).hashCode();
return 31 * result + super.hashCode();
}