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/19 14:52:31 UTC
svn commit: r1660883 [2/2] - in
/webservices/wss4j/trunk/ws-security-policy-stax/src:
main/java/org/apache/wss4j/policy/stax/
main/java/org/apache/wss4j/policy/stax/assertionStates/
test/java/org/apache/wss4j/policy/stax/test/
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/LayoutTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/LayoutTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/LayoutTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/LayoutTest.java Thu Feb 19 13:52:29 2015
@@ -38,7 +38,7 @@ public class LayoutTest extends Abstract
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_wsu_Timestamp);
requiredElementSecurityEvent.setElementPath(headerPath);
@@ -50,7 +50,7 @@ public class LayoutTest extends Abstract
x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(x509TokenSecurityEvent.getSecurityToken(), true, protectionOrder);
@@ -82,7 +82,7 @@ public class LayoutTest extends Abstract
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_wsu_Timestamp);
requiredElementSecurityEvent.setElementPath(headerPath);
@@ -94,7 +94,7 @@ public class LayoutTest extends Abstract
x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(x509TokenSecurityEvent.getSecurityToken(), true, protectionOrder);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ProtectionOrderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ProtectionOrderTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ProtectionOrderTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/ProtectionOrderTest.java Thu Feb 19 13:52:29 2015
@@ -55,7 +55,7 @@ public class ProtectionOrderTest extends
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
@@ -100,7 +100,7 @@ public class ProtectionOrderTest extends
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(null, true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
@@ -126,7 +126,7 @@ public class ProtectionOrderTest extends
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(null, true, protectionOrder);
@@ -161,7 +161,7 @@ public class ProtectionOrderTest extends
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
@@ -207,7 +207,7 @@ public class ProtectionOrderTest extends
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
EncryptedPartSecurityEvent encryptedPartSecurityEvent = new EncryptedPartSecurityEvent(null, true, protectionOrder);
encryptedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
@@ -234,7 +234,7 @@ public class ProtectionOrderTest extends
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
EncryptedPartSecurityEvent encryptedPartSecurityEvent = new EncryptedPartSecurityEvent(null, true, protectionOrder);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RelTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RelTokenTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RelTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RelTokenTest.java Thu Feb 19 13:52:29 2015
@@ -85,7 +85,7 @@ public class RelTokenTest extends Abstra
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent =
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredElementsTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredElementsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredElementsTest.java Thu Feb 19 13:52:29 2015
@@ -48,12 +48,12 @@ public class RequiredElementsTest extend
RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
requiredElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.add(new QName("http://example.org", "a"));
requiredElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
//additional RequiredElements are also allowed!
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.add(new QName("http://example.org", "b"));
requiredElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(requiredElementSecurityEvent);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredPartsTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredPartsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/RequiredPartsTest.java Thu Feb 19 13:52:29 2015
@@ -42,7 +42,7 @@ public class RequiredPartsTest extends A
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
RequiredPartSecurityEvent requiredPartSecurityEvent = new RequiredPartSecurityEvent();
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
headerPath.add(new QName("http://example.org", "a"));
requiredPartSecurityEvent.setElementPath(headerPath);
@@ -50,7 +50,7 @@ public class RequiredPartsTest extends A
//additional requiredParts are also allowed!
requiredPartSecurityEvent = new RequiredPartSecurityEvent();
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
headerPath.add(new QName("http://example.org", "b"));
requiredPartSecurityEvent.setElementPath(headerPath);
@@ -72,7 +72,7 @@ public class RequiredPartsTest extends A
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
RequiredPartSecurityEvent requiredPartSecurityEvent = new RequiredPartSecurityEvent();
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
headerPath.add(new QName("http://example.org", "b"));
requiredPartSecurityEvent.setElementPath(headerPath);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SamlTokenTest.java Thu Feb 19 13:52:29 2015
@@ -104,7 +104,7 @@ public class SamlTokenTest extends Abstr
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent =
@@ -189,7 +189,7 @@ public class SamlTokenTest extends Abstr
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent =
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecureConversationTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecureConversationTokenTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecureConversationTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecureConversationTokenTest.java Thu Feb 19 13:52:29 2015
@@ -90,7 +90,7 @@ public class SecureConversationTokenTest
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent =
@@ -161,7 +161,7 @@ public class SecureConversationTokenTest
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent =
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecurityContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecurityContextTokenTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecurityContextTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SecurityContextTokenTest.java Thu Feb 19 13:52:29 2015
@@ -92,7 +92,7 @@ public class SecurityContextTokenTest ex
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent =
@@ -164,7 +164,7 @@ public class SecurityContextTokenTest ex
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent =
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedElementsTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedElementsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedElementsTest.java Thu Feb 19 13:52:29 2015
@@ -48,19 +48,19 @@ public class SignedElementsTest extends
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedElementSecurityEvent signedElementSecurityEvent = new SignedElementSecurityEvent(null, true, protectionOrder);
signedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedElementSecurityEvent);
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
headerPath.add(new QName("http://example.org", "a"));
signedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(signedElementSecurityEvent);
//additional SignedElements are also allowed!
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
headerPath.add(new QName("http://example.org", "b"));
signedElementSecurityEvent.setElementPath(headerPath);
@@ -80,14 +80,14 @@ public class SignedElementsTest extends
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedElementSecurityEvent signedElementSecurityEvent = new SignedElementSecurityEvent(null, true, protectionOrder);
signedElementSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedElementSecurityEvent);
signedElementSecurityEvent = new SignedElementSecurityEvent(null, false, null);
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.add(new QName("http://example.org", "a"));
signedElementSecurityEvent.setElementPath(headerPath);
try {
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedPartsTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedPartsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SignedPartsTest.java Thu Feb 19 13:52:29 2015
@@ -53,19 +53,19 @@ public class SignedPartsTest extends Abs
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(null, true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
headerPath.add(new QName("http://example.org", "a"));
signedPartSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
//additional signedParts are also allowed!
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
headerPath.add(new QName("http://example.org", "b"));
signedPartSecurityEvent.setElementPath(headerPath);
@@ -90,14 +90,14 @@ public class SignedPartsTest extends Abs
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(null, true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
signedPartSecurityEvent = new SignedPartSecurityEvent(null, false, null);
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
headerPath.add(new QName("http://example.org", "a"));
signedPartSecurityEvent.setElementPath(headerPath);
@@ -123,18 +123,18 @@ public class SignedPartsTest extends Abs
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(null, true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
headerPath.add(new QName("http://example.org", "a"));
signedPartSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
headerPath.add(new QName("http://example.org", "b"));
signedPartSecurityEvent.setElementPath(headerPath);
@@ -182,19 +182,19 @@ public class SignedPartsTest extends Abs
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(null, true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
headerPath.add(new QName("http://example.org", "a"));
signedPartSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
//additional signedParts are also allowed!
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
headerPath.add(new QName("http://example.org", "b"));
signedPartSecurityEvent.setElementPath(headerPath);
@@ -219,14 +219,14 @@ public class SignedPartsTest extends Abs
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(null, true, protectionOrder);
signedPartSecurityEvent.setElementPath(WSSConstants.SOAP_11_BODY_PATH);
policyEnforcer.registerSecurityEvent(signedPartSecurityEvent);
signedPartSecurityEvent = new SignedPartSecurityEvent(null, false, null);
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.SOAP_11_HEADER_PATH);
headerPath.add(new QName("http://example.org", "a"));
signedPartSecurityEvent.setElementPath(headerPath);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SpnegoContextTokenTest.java Thu Feb 19 13:52:29 2015
@@ -85,7 +85,7 @@ public class SpnegoContextTokenTest exte
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent =
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SymmetricBindingTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SymmetricBindingTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/SymmetricBindingTest.java Thu Feb 19 13:52:29 2015
@@ -60,7 +60,7 @@ public class SymmetricBindingTest extend
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_wsu_Timestamp);
requiredElementSecurityEvent.setElementPath(headerPath);
@@ -81,18 +81,18 @@ public class SymmetricBindingTest extend
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
EncryptedElementSecurityEvent encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, protectionOrder);
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_dsig_Signature);
encryptedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, protectionOrder);
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_wsse11_SignatureConfirmation);
encryptedElementSecurityEvent.setElementPath(headerPath);
@@ -183,7 +183,7 @@ public class SymmetricBindingTest extend
SecurityContextTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(SecurityContextTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(null, true, protectionOrder);
@@ -238,11 +238,11 @@ public class SymmetricBindingTest extend
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
EncryptedElementSecurityEvent encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, false, protectionOrder);
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_dsig_Signature);
encryptedElementSecurityEvent.setElementPath(headerPath);
@@ -294,18 +294,18 @@ public class SymmetricBindingTest extend
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
EncryptedElementSecurityEvent encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, protectionOrder);
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_dsig_Signature);
encryptedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, protectionOrder);
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_wsse11_SignatureConfirmation);
encryptedElementSecurityEvent.setElementPath(headerPath);
@@ -318,7 +318,7 @@ public class SymmetricBindingTest extend
SignedPartSecurityEvent signedPartSecurityEvent = new SignedPartSecurityEvent(null, true, protectionOrder);
QName elementName = new QName("http://www.example.com", "bodyChildElement");
signedPartSecurityEvent.setXmlSecEvent(XMLSecEventFactory.createXmlSecStartElement(elementName, null, null));
- List<QName> elementPath = new ArrayList<QName>();
+ List<QName> elementPath = new ArrayList<>();
elementPath.addAll(WSSConstants.SOAP_11_BODY_PATH);
elementPath.add(elementName);
signedPartSecurityEvent.setElementPath(elementPath);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TokenProtectionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TokenProtectionTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TokenProtectionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TokenProtectionTest.java Thu Feb 19 13:52:29 2015
@@ -43,7 +43,7 @@ import java.util.*;
public class TokenProtectionTest extends AbstractPolicyTestBase {
- private static List<WSSecurityTokenConstants.TokenUsage> tokenUsages = new ArrayList<WSSecurityTokenConstants.TokenUsage>();
+ private static List<WSSecurityTokenConstants.TokenUsage> tokenUsages = new ArrayList<>();
static {
tokenUsages.add(WSSecurityTokenConstants.TokenUsage_Signature);
@@ -75,18 +75,18 @@ public class TokenProtectionTest extends
"</sp:AsymmetricBinding>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
- List<QName> bstPath = new ArrayList<QName>();
+ List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
- List<QName> sigPath = new ArrayList<QName>();
+ List<QName> sigPath = new ArrayList<>();
sigPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
sigPath.add(WSSConstants.TAG_dsig_Signature);
- List<SecurityToken> securityTokens = new LinkedList<SecurityToken>();
+ List<SecurityToken> securityTokens = new LinkedList<>();
for (int i = 0; i < tokenUsages.size(); i++) {
WSSecurityTokenConstants.TokenUsage tokenUsage = tokenUsages.get(i);
@@ -154,18 +154,18 @@ public class TokenProtectionTest extends
"</sp:AsymmetricBinding>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
- List<QName> bstPath = new ArrayList<QName>();
+ List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
- List<QName> sigPath = new ArrayList<QName>();
+ List<QName> sigPath = new ArrayList<>();
sigPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
sigPath.add(WSSConstants.TAG_dsig_Signature);
- List<SecurityToken> securityTokens = new LinkedList<SecurityToken>();
+ List<SecurityToken> securityTokens = new LinkedList<>();
for (int i = 0; i < tokenUsages.size(); i++) {
WSSecurityTokenConstants.TokenUsage tokenUsage = tokenUsages.get(i);
@@ -235,7 +235,7 @@ public class TokenProtectionTest extends
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
X509SecurityTokenImpl securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
- List<QName> path = new ArrayList<QName>();
+ List<QName> path = new ArrayList<>();
path.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
path.add(WSSConstants.TAG_wsse_BinarySecurityToken);
securityToken.setElementPath(path);
@@ -243,7 +243,7 @@ public class TokenProtectionTest extends
x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
SignedElementSecurityEvent signedElementSecurityEvent = new SignedElementSecurityEvent(securityToken, false, protectionOrder);
@@ -281,7 +281,7 @@ public class TokenProtectionTest extends
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
X509SecurityTokenImpl securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
- List<QName> path = new ArrayList<QName>();
+ List<QName> path = new ArrayList<>();
path.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
path.add(WSSConstants.TAG_wsse_BinarySecurityToken);
securityToken.setElementPath(path);
@@ -289,7 +289,7 @@ public class TokenProtectionTest extends
x509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(x509TokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
SignedElementSecurityEvent signedElementSecurityEvent = new SignedElementSecurityEvent(getX509Token(WSSecurityTokenConstants.X509V3Token), false, protectionOrder);
@@ -327,14 +327,14 @@ public class TokenProtectionTest extends
X509TokenSecurityEvent x509TokenSecurityEvent = new X509TokenSecurityEvent();
X509SecurityTokenImpl securityToken = getX509Token(WSSecurityTokenConstants.X509V3Token);
- List<QName> path = new ArrayList<QName>();
+ List<QName> path = new ArrayList<>();
path.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
path.add(WSSConstants.TAG_wsse_BinarySecurityToken);
securityToken.setElementPath(path);
securityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
x509TokenSecurityEvent.setSecurityToken(securityToken);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
SignedElementSecurityEvent signedElementSecurityEvent = new SignedElementSecurityEvent(getX509Token(WSSecurityTokenConstants.X509V3Token), false, protectionOrder);
@@ -372,14 +372,14 @@ public class TokenProtectionTest extends
"</sp:AsymmetricBinding>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
- List<QName> bstPath = new ArrayList<QName>();
+ List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
- List<SecurityToken> securityTokens = new LinkedList<SecurityToken>();
+ List<SecurityToken> securityTokens = new LinkedList<>();
for (int i = 0; i < tokenUsages.size(); i++) {
WSSecurityTokenConstants.TokenUsage tokenUsage = tokenUsages.get(i);
@@ -448,14 +448,14 @@ public class TokenProtectionTest extends
"</sp:AsymmetricBinding>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
- List<QName> bstPath = new ArrayList<QName>();
+ List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
- List<QName> sigPath = new ArrayList<QName>();
+ List<QName> sigPath = new ArrayList<>();
sigPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
sigPath.add(WSSConstants.TAG_dsig_Signature);
@@ -510,18 +510,18 @@ public class TokenProtectionTest extends
"</sp:SymmetricBinding>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
- List<QName> bstPath = new ArrayList<QName>();
+ List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
- List<QName> ekPath = new ArrayList<QName>();
+ List<QName> ekPath = new ArrayList<>();
ekPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
ekPath.add(WSSConstants.TAG_xenc_EncryptedKey);
- List<QName> sigPath = new ArrayList<QName>();
+ List<QName> sigPath = new ArrayList<>();
sigPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
sigPath.add(WSSConstants.TAG_dsig_Signature);
@@ -577,18 +577,18 @@ public class TokenProtectionTest extends
"</sp:SymmetricBinding>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
- List<QName> bstPath = new ArrayList<QName>();
+ List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
- List<QName> ekPath = new ArrayList<QName>();
+ List<QName> ekPath = new ArrayList<>();
ekPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
ekPath.add(WSSConstants.TAG_xenc_EncryptedKey);
- List<QName> sigPath = new ArrayList<QName>();
+ List<QName> sigPath = new ArrayList<>();
sigPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
sigPath.add(WSSConstants.TAG_dsig_Signature);
@@ -650,18 +650,18 @@ public class TokenProtectionTest extends
"</sp:SymmetricBinding>";
PolicyEnforcer policyEnforcer = buildAndStartPolicyEngine(policyString);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
- List<QName> bstPath = new ArrayList<QName>();
+ List<QName> bstPath = new ArrayList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
- List<QName> ekPath = new ArrayList<QName>();
+ List<QName> ekPath = new ArrayList<>();
ekPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
ekPath.add(WSSConstants.TAG_xenc_EncryptedKey);
- List<QName> sigPath = new ArrayList<QName>();
+ List<QName> sigPath = new ArrayList<>();
sigPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
sigPath.add(WSSConstants.TAG_dsig_Signature);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java Thu Feb 19 13:52:29 2015
@@ -110,7 +110,7 @@ public class TransportBindingIntegration
outSecurityProperties.setSignatureUser("transmitter");
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
actions.add(WSSConstants.ENCRYPT);
@@ -134,7 +134,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
Document document = doInboundSecurity(inSecurityProperties, new ByteArrayInputStream(baos.toByteArray()), securityEventList, policyEnforcer);
@@ -213,7 +213,7 @@ public class TransportBindingIntegration
outSecurityProperties.setSignatureUser("transmitter");
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.SIGNATURE);
actions.add(WSSConstants.ENCRYPT);
outSecurityProperties.setActions(actions);
@@ -236,7 +236,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
try {
@@ -334,7 +334,7 @@ public class TransportBindingIntegration
outSecurityProperties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE);
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
@@ -359,7 +359,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
Document document = doInboundSecurity(inSecurityProperties, new ByteArrayInputStream(baos.toByteArray()), securityEventList, policyEnforcer);
@@ -449,7 +449,7 @@ public class TransportBindingIntegration
outSecurityProperties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE);
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
actions.add(WSSConstants.ENCRYPT);
@@ -473,7 +473,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
try {
@@ -551,7 +551,7 @@ public class TransportBindingIntegration
outSecurityProperties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE);
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.SIGNATURE);
actions.add(WSSConstants.ENCRYPT);
outSecurityProperties.setActions(actions);
@@ -574,7 +574,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
try {
@@ -672,7 +672,7 @@ public class TransportBindingIntegration
outSecurityProperties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE);
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
@@ -697,7 +697,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
Document document = doInboundSecurity(inSecurityProperties, new ByteArrayInputStream(baos.toByteArray()), securityEventList, policyEnforcer);
@@ -780,7 +780,7 @@ public class TransportBindingIntegration
outSecurityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.ENCRYPT);
@@ -805,7 +805,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
Document document = doInboundSecurity(inSecurityProperties, new ByteArrayInputStream(baos.toByteArray()), securityEventList, policyEnforcer);
@@ -912,7 +912,7 @@ public class TransportBindingIntegration
outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Element));
outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
@@ -937,7 +937,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
Document document = doInboundSecurity(inSecurityProperties, new ByteArrayInputStream(baos.toByteArray()), securityEventList, policyEnforcer);
@@ -1032,7 +1032,7 @@ public class TransportBindingIntegration
outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Element));
outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
@@ -1057,7 +1057,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
try {
@@ -1150,7 +1150,7 @@ public class TransportBindingIntegration
outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Created.getNamespaceURI(), WSSConstants.TAG_wsu_Created.getLocalPart()), SecurePart.Modifier.Element));
outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Expires.getNamespaceURI(), WSSConstants.TAG_wsu_Expires.getLocalPart()), SecurePart.Modifier.Content));
outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
actions.add(WSSConstants.ENCRYPT);
@@ -1175,7 +1175,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
try {
@@ -1268,7 +1268,7 @@ public class TransportBindingIntegration
outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Created.getNamespaceURI(), WSSConstants.TAG_wsu_Created.getLocalPart()), SecurePart.Modifier.Element));
outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Expires.getNamespaceURI(), WSSConstants.TAG_wsu_Expires.getLocalPart()), SecurePart.Modifier.Content));
outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
actions.add(WSSConstants.ENCRYPT);
@@ -1295,7 +1295,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
try {
@@ -1388,7 +1388,7 @@ public class TransportBindingIntegration
outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Created.getNamespaceURI(), WSSConstants.TAG_wsu_Created.getLocalPart()), SecurePart.Modifier.Element));
outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Expires.getNamespaceURI(), WSSConstants.TAG_wsu_Expires.getLocalPart()), SecurePart.Modifier.Content));
outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
actions.add(WSSConstants.ENCRYPT);
@@ -1413,7 +1413,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
try {
@@ -1510,7 +1510,7 @@ public class TransportBindingIntegration
outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Created.getNamespaceURI(), WSSConstants.TAG_wsu_Created.getLocalPart()), SecurePart.Modifier.Element));
outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_wsu_Expires.getNamespaceURI(), WSSConstants.TAG_wsu_Expires.getLocalPart()), SecurePart.Modifier.Content));
outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
actions.add(WSSConstants.ENCRYPT);
@@ -1534,7 +1534,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSSecurityTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
try {
@@ -1648,7 +1648,7 @@ public class TransportBindingIntegration
httpsSecurityToken.addTokenUsage(WSTokenConstants.TokenUsage_MainSignature);
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
- List<SecurityEvent> securityEventList = new ArrayList<SecurityEvent>();
+ List<SecurityEvent> securityEventList = new ArrayList<>();
securityEventList.add(httpsTokenSecurityEvent);
try {
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingTest.java Thu Feb 19 13:52:29 2015
@@ -56,7 +56,7 @@ public class TransportBindingTest extend
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_wsu_Timestamp);
requiredElementSecurityEvent.setElementPath(headerPath);
@@ -72,18 +72,18 @@ public class TransportBindingTest extend
operationSecurityEvent.setOperation(new QName("definitions"));
policyEnforcer.registerSecurityEvent(operationSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
EncryptedElementSecurityEvent encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, protectionOrder);
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_dsig_Signature);
requiredElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, protectionOrder);
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_wsse11_SignatureConfirmation);
requiredElementSecurityEvent.setElementPath(headerPath);
@@ -152,7 +152,7 @@ public class TransportBindingTest extend
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_wsu_Timestamp);
requiredElementSecurityEvent.setElementPath(headerPath);
@@ -164,11 +164,11 @@ public class TransportBindingTest extend
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
policyEnforcer.registerSecurityEvent(httpsTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
EncryptedElementSecurityEvent encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, false, protectionOrder);
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_dsig_Signature);
encryptedElementSecurityEvent.setElementPath(headerPath);
@@ -199,7 +199,7 @@ public class TransportBindingTest extend
policyEnforcer.registerSecurityEvent(timestampSecurityEvent);
RequiredElementSecurityEvent requiredElementSecurityEvent = new RequiredElementSecurityEvent();
- List<QName> headerPath = new ArrayList<QName>();
+ List<QName> headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_wsu_Timestamp);
requiredElementSecurityEvent.setElementPath(headerPath);
@@ -211,18 +211,18 @@ public class TransportBindingTest extend
httpsTokenSecurityEvent.setSecurityToken(httpsSecurityToken);
policyEnforcer.registerSecurityEvent(httpsTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
EncryptedElementSecurityEvent encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, protectionOrder);
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_dsig_Signature);
encryptedElementSecurityEvent.setElementPath(headerPath);
policyEnforcer.registerSecurityEvent(encryptedElementSecurityEvent);
encryptedElementSecurityEvent = new EncryptedElementSecurityEvent(null, true, protectionOrder);
- headerPath = new ArrayList<QName>();
+ headerPath = new ArrayList<>();
headerPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
headerPath.add(WSSConstants.TAG_wsse11_SignatureConfirmation);
encryptedElementSecurityEvent.setElementPath(headerPath);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/UsernameTokenTest.java Thu Feb 19 13:52:29 2015
@@ -98,7 +98,7 @@ public class UsernameTokenTest extends A
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent =
@@ -176,7 +176,7 @@ public class UsernameTokenTest extends A
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent =
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java Thu Feb 19 13:52:29 2015
@@ -66,7 +66,7 @@ public class VulnerabliltyVectorsTest ex
outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_wsu_Timestamp, SecurePart.Modifier.Element));
outSecurityProperties.addSignaturePart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Element));
outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_soap11_Body, SecurePart.Modifier.Content));
- List<WSSConstants.Action> actions = new ArrayList<WSSConstants.Action>();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.SIGNATURE);
actions.add(WSSConstants.ENCRYPT);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/X509TokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/X509TokenTest.java?rev=1660883&r1=1660882&r2=1660883&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/X509TokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/X509TokenTest.java Thu Feb 19 13:52:29 2015
@@ -87,7 +87,7 @@ public class X509TokenTest extends Abstr
recipientX509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientX509TokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent =
@@ -157,7 +157,7 @@ public class X509TokenTest extends Abstr
recipientX509TokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientX509TokenSecurityEvent);
- List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<XMLSecurityConstants.ContentType>();
+ List<XMLSecurityConstants.ContentType> protectionOrder = new LinkedList<>();
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
SignedPartSecurityEvent signedPartSecurityEvent =