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/02/16 12:48:52 UTC
svn commit: r1660080 - in /webservices/wss4j/trunk/policy: ./
src/main/java/org/apache/wss4j/policy/
src/main/java/org/apache/wss4j/policy/builders/
src/main/java/org/apache/wss4j/policy/model/
Author: coheigea
Date: Mon Feb 16 11:48:51 2015
New Revision: 1660080
URL: http://svn.apache.org/r1660080
Log:
More refactoring
Removed:
webservices/wss4j/trunk/policy/rampart-project.patch
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP12Constants.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RequiredPartsBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedElementsBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Layout.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RelToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RequiredElements.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RequiredParts.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SamlToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/UsernameToken.java
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java Mon Feb 16 11:48:51 2015
@@ -694,7 +694,7 @@ public class SP11Constants extends SPCon
EndorsingSupportingTokens(ENDORSING_SUPPORTING_TOKENS),
SignedEndorsingSupportingTokens(SIGNED_ENDORSING_SUPPORTING_TOKENS);
- private static final Map<QName, SupportingTokenTypes> lookup = new HashMap<QName, SupportingTokenTypes>();
+ private static final Map<QName, SupportingTokenTypes> lookup = new HashMap<>();
static {
for (SupportingTokenTypes u : EnumSet.allOf(SupportingTokenTypes.class))
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP12Constants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP12Constants.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP12Constants.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP12Constants.java Mon Feb 16 11:48:51 2015
@@ -754,7 +754,7 @@ public class SP12Constants extends SPCon
EndorsingEncryptedSupportingTokens(ENDORSING_ENCRYPTED_SUPPORTING_TOKENS),
SignedEndorsingEncryptedSupportingTokens(SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS);
- private static final Map<QName, SupportingTokenTypes> lookup = new HashMap<QName, SupportingTokenTypes>();
+ private static final Map<QName, SupportingTokenTypes> lookup = new HashMap<>();
static {
for (SupportingTokenTypes u : EnumSet.allOf(SupportingTokenTypes.class))
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java Mon Feb 16 11:48:51 2015
@@ -47,7 +47,7 @@ public abstract class SPConstants {
this.prefix = prefix;
}
- private static final Map<String, SPVersion> lookup = new HashMap<String, SPVersion>();
+ private static final Map<String, SPVersion> lookup = new HashMap<>();
static {
for (SPVersion spVersion : EnumSet.allOf(SPVersion.class))
@@ -503,7 +503,7 @@ public abstract class SPConstants {
INCLUDE_TOKEN_ALWAYS_TO_INITIATOR,
INCLUDE_TOKEN_ALWAYS;
- private static final Map<String, IncludeTokenType> lookup = new HashMap<String, IncludeTokenType>();
+ private static final Map<String, IncludeTokenType> lookup = new HashMap<>();
static {
for (IncludeTokenType u : EnumSet.allOf(IncludeTokenType.class))
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RequiredPartsBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RequiredPartsBuilder.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RequiredPartsBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RequiredPartsBuilder.java Mon Feb 16 11:48:51 2015
@@ -47,7 +47,7 @@ public class RequiredPartsBuilder implem
}
protected List<Header> getHeaders(Element element, boolean ignoreNameElement, SPConstants.SPVersion spVersion) {
- List<Header> headers = new ArrayList<Header>();
+ List<Header> headers = new ArrayList<>();
Element child = SPUtils.getFirstChildElement(element);
while (child != null) {
if (SPConstants.HEADER.equals(child.getLocalName()) && spVersion.getNamespace().equals(child.getNamespaceURI())) {
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedElementsBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedElementsBuilder.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedElementsBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedElementsBuilder.java Mon Feb 16 11:48:51 2015
@@ -54,13 +54,13 @@ public class SignedElementsBuilder imple
}
protected List<XPath> getXPathExpressions(Element element, SPConstants.SPVersion spVersion) {
- List<XPath> xPaths = new ArrayList<XPath>();
+ List<XPath> xPaths = new ArrayList<>();
Element child = SPUtils.getFirstChildElement(element);
while (child != null) {
if (SPConstants.XPATH_EXPR.equals(child.getLocalName())
&& spVersion.getSPConstants().getXPathExpression().getNamespaceURI().equals(child.getNamespaceURI())) {
- Map<String, String> declaredNamespaces = new HashMap<String, String>();
+ Map<String, String> declaredNamespaces = new HashMap<>();
addDeclaredNamespaces(child, declaredNamespaces);
xPaths.add(new XPath(child.getTextContent().trim(), XPath.Version.V1, null, declaredNamespaces));
}
@@ -70,13 +70,13 @@ public class SignedElementsBuilder imple
}
protected List<XPath> getXPath2Expressions(Element element, SPConstants.SPVersion spVersion) {
- List<XPath> xPaths = new ArrayList<XPath>();
+ List<XPath> xPaths = new ArrayList<>();
Element child = SPUtils.getFirstChildElement(element);
while (child != null) {
if (SPConstants.XPATH2_EXPR.equals(child.getLocalName())
&& spVersion.getSPConstants().getXPath2Expression().getNamespaceURI().equals(child.getNamespaceURI())) {
- Map<String, String> declaredNamespaces = new HashMap<String, String>();
+ Map<String, String> declaredNamespaces = new HashMap<>();
addDeclaredNamespaces(child, declaredNamespaces);
String filter = child.getAttributeNS(null, SPConstants.FILTER);
if (filter == null || "".equals(filter)) {
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java Mon Feb 16 11:48:51 2015
@@ -30,7 +30,7 @@ public abstract class AbstractSymmetricA
EncryptBeforeSigning,
SignBeforeEncrypting;
- private static final Map<String, ProtectionOrder> lookup = new HashMap<String, ProtectionOrder>();
+ private static final Map<String, ProtectionOrder> lookup = new HashMap<>();
static {
for (ProtectionOrder u : EnumSet.allOf(ProtectionOrder.class))
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java Mon Feb 16 11:48:51 2015
@@ -39,7 +39,7 @@ public abstract class AbstractToken exte
RequireExplicitDerivedKeys,
RequireImpliedDerivedKeys;
- private static final Map<String, X509Token.DerivedKeys> lookup = new HashMap<String, X509Token.DerivedKeys>();
+ private static final Map<String, X509Token.DerivedKeys> lookup = new HashMap<>();
static {
for (DerivedKeys u : EnumSet.allOf(DerivedKeys.class))
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java Mon Feb 16 11:48:51 2015
@@ -31,7 +31,7 @@ import java.util.*;
public class AlgorithmSuite extends AbstractSecurityAssertion implements PolicyContainingAssertion {
- protected static final Map<String, AlgorithmSuiteType> algorithmSuiteTypes = new HashMap<String, AlgorithmSuiteType>();
+ protected static final Map<String, AlgorithmSuiteType> algorithmSuiteTypes = new HashMap<>();
static {
algorithmSuiteTypes.put("Basic256", new AlgorithmSuiteType(
@@ -299,7 +299,7 @@ public class AlgorithmSuite extends Abst
XPathFilter20(SPConstants.XPATH20),
AbsXPath(SPConstants.ABS_XPATH);
- private static final Map<String, XPathType> lookup = new HashMap<String, XPathType>();
+ private static final Map<String, XPathType> lookup = new HashMap<>();
static {
for (XPathType u : EnumSet.allOf(XPathType.class))
@@ -326,7 +326,7 @@ public class AlgorithmSuite extends Abst
InclusiveC14N(SPConstants.C14N),
InclusiveC14N11(SPConstants.C14N11);
- private static final Map<String, C14NType> lookup = new HashMap<String, C14NType>();
+ private static final Map<String, C14NType> lookup = new HashMap<>();
static {
for (C14NType u : EnumSet.allOf(C14NType.class))
@@ -352,7 +352,7 @@ public class AlgorithmSuite extends Abst
SOAPNormalizationNone(null),
SOAPNormalization10(SPConstants.SOAP_NORMALIZATION_10);
- private static final Map<String, SOAPNormType> lookup = new HashMap<String, SOAPNormType>();
+ private static final Map<String, SOAPNormType> lookup = new HashMap<>();
static {
for (SOAPNormType u : EnumSet.allOf(SOAPNormType.class))
@@ -378,7 +378,7 @@ public class AlgorithmSuite extends Abst
STRTransformNone(null),
STRTransform10(SPConstants.STR_TRANSFORM_10);
- private static final Map<String, STRType> lookup = new HashMap<String, STRType>();
+ private static final Map<String, STRType> lookup = new HashMap<>();
static {
for (STRType u : EnumSet.allOf(STRType.class))
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java Mon Feb 16 11:48:51 2015
@@ -33,7 +33,7 @@ public class HttpsToken extends Abstract
HttpDigestAuthentication,
RequireClientCertificate;
- private static final Map<String, AuthenticationType> lookup = new HashMap<String, AuthenticationType>();
+ private static final Map<String, AuthenticationType> lookup = new HashMap<>();
static {
for (AuthenticationType u : EnumSet.allOf(AuthenticationType.class))
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java Mon Feb 16 11:48:51 2015
@@ -32,7 +32,7 @@ public class KerberosToken extends Abstr
WssKerberosV5ApReqToken11,
WssGssKerberosV5ApReqToken11;
- private static final Map<String, ApReqTokenType> lookup = new HashMap<String, ApReqTokenType>();
+ private static final Map<String, ApReqTokenType> lookup = new HashMap<>();
static {
for (ApReqTokenType u : EnumSet.allOf(ApReqTokenType.class))
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Layout.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Layout.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Layout.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Layout.java Mon Feb 16 11:48:51 2015
@@ -37,7 +37,7 @@ public class Layout extends AbstractSecu
LaxTsFirst,
LaxTsLast;
- private static final Map<String, LayoutType> lookup = new HashMap<String, LayoutType>();
+ private static final Map<String, LayoutType> lookup = new HashMap<>();
static {
for (LayoutType u : EnumSet.allOf(LayoutType.class))
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RelToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RelToken.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RelToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RelToken.java Mon Feb 16 11:48:51 2015
@@ -34,7 +34,7 @@ public class RelToken extends AbstractTo
WssRelV10Token11,
WssRelV20Token11;
- private static final Map<String, RelTokenType> lookup = new HashMap<String, RelTokenType>();
+ private static final Map<String, RelTokenType> lookup = new HashMap<>();
static {
for (RelTokenType u : EnumSet.allOf(RelTokenType.class))
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RequiredElements.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RequiredElements.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RequiredElements.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RequiredElements.java Mon Feb 16 11:48:51 2015
@@ -33,7 +33,7 @@ import java.util.Map;
public class RequiredElements extends AbstractSecurityAssertion {
private String xPathVersion;
- private final List<XPath> xPaths = new ArrayList<XPath>();
+ private final List<XPath> xPaths = new ArrayList<>();
public RequiredElements(SPConstants.SPVersion version, String xPathVersion, List<XPath> xPaths) {
super(version);
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RequiredParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RequiredParts.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RequiredParts.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RequiredParts.java Mon Feb 16 11:48:51 2015
@@ -30,7 +30,7 @@ import java.util.List;
public class RequiredParts extends AbstractSecurityAssertion {
- private final List<Header> headers = new ArrayList<Header>();
+ private final List<Header> headers = new ArrayList<>();
public RequiredParts(SPConstants.SPVersion version, List<Header> headers) {
super(version);
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SamlToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SamlToken.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SamlToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SamlToken.java Mon Feb 16 11:48:51 2015
@@ -35,7 +35,7 @@ public class SamlToken extends AbstractT
WssSamlV11Token11,
WssSamlV20Token11;
- private static final Map<String, SamlTokenType> lookup = new HashMap<String, SamlTokenType>();
+ private static final Map<String, SamlTokenType> lookup = new HashMap<>();
static {
for (SamlTokenType u : EnumSet.allOf(SamlTokenType.class))
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java Mon Feb 16 11:48:51 2015
@@ -33,7 +33,7 @@ import java.util.List;
public class SupportingTokens extends AbstractTokenWrapper {
private SupportingTokenType supportingTokenType;
- private final List<AbstractToken> tokens = new ArrayList<AbstractToken>();
+ private final List<AbstractToken> tokens = new ArrayList<>();
private AlgorithmSuite algorithmSuite;
private SignedParts signedParts;
private SignedElements signedElements;
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/UsernameToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/UsernameToken.java?rev=1660080&r1=1660079&r2=1660080&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/UsernameToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/UsernameToken.java Mon Feb 16 11:48:51 2015
@@ -32,7 +32,7 @@ public class UsernameToken extends Abstr
NoPassword,
HashPassword;
- private static final Map<String, PasswordType> lookup = new HashMap<String, PasswordType>();
+ private static final Map<String, PasswordType> lookup = new HashMap<>();
static {
for (PasswordType u : EnumSet.allOf(PasswordType.class))
@@ -48,7 +48,7 @@ public class UsernameToken extends Abstr
WssUsernameToken10,
WssUsernameToken11;
- private static final Map<String, UsernameTokenType> lookup = new HashMap<String, UsernameTokenType>();
+ private static final Map<String, UsernameTokenType> lookup = new HashMap<>();
static {
for (UsernameTokenType u : EnumSet.allOf(UsernameTokenType.class))