Author: coheigea
Date: Fri Mar 22 15:59:48 2013
New Revision: 1459859
URL: http://svn.apache.org/r1459859
Log:
Avoiding some Collection creation
Conflicts:
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java
cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=1459859&r1=1459858&r2=1459859&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
(original)
+++
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
Fri Mar 22 15:59:48 2013
@@ -603,9 +603,11 @@ public class PolicyBasedWSS4JInIntercept
//
// Pre-fetch various results
//
- List<WSSecurityEngineResult> signedResults = new
ArrayList<WSSecurityEngineResult>();
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.SIGN,
signedResults);
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.UT_SIGN,
signedResults);
+ final List<Integer> actions = new ArrayList<Integer>(2);
+ actions.add(WSConstants.SIGN);
+ actions.add(WSConstants.UT_SIGN);
+ List<WSSecurityEngineResult> signedResults =
+ WSSecurityUtil.fetchAllActionResults(results, actions);
for (WSSecurityEngineResult result : signedResults) {
List<WSDataRef> sl =
CastUtils.cast((List<?>)result.get(WSSecurityEngineResult.TAG_DATA_REF_URIS));
@@ -616,8 +618,8 @@ public class PolicyBasedWSS4JInIntercept
}
}
- List<WSSecurityEngineResult> encryptResults = new
ArrayList<WSSecurityEngineResult>();
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.ENCR,
encryptResults);
+ List<WSSecurityEngineResult> encryptResults =
+ WSSecurityUtil.fetchAllActionResults(results, WSConstants.ENCR);
for (WSSecurityEngineResult result : encryptResults) {
List<WSDataRef> sl =
CastUtils.cast((List<?>)result.get(WSSecurityEngineResult.TAG_DATA_REF_URIS));
@@ -769,13 +771,17 @@ public class PolicyBasedWSS4JInIntercept
List<WSSecurityEngineResult> encryptedResults,
boolean utWithCallbacks
) {
- List<WSSecurityEngineResult> utResults = new
ArrayList<WSSecurityEngineResult>();
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.UT,
utResults);
- WSSecurityUtil.fetchAllActionResults(results,
WSConstants.UT_NOPASSWORD, utResults);
-
- List<WSSecurityEngineResult> samlResults = new
ArrayList<WSSecurityEngineResult>();
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.ST_SIGNED,
samlResults);
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.ST_UNSIGNED,
samlResults);
+ final List<Integer> utActions = new ArrayList<Integer>(2);
+ utActions.add(WSConstants.UT);
+ utActions.add(WSConstants.UT_NOPASSWORD);
+ List<WSSecurityEngineResult> utResults =
+ WSSecurityUtil.fetchAllActionResults(results, utActions);
+
+ final List<Integer> samlActions = new ArrayList<Integer>(2);
+ samlActions.add(WSConstants.ST_SIGNED);
+ samlActions.add(WSConstants.ST_UNSIGNED);
+ List<WSSecurityEngineResult> samlResults =
+ WSSecurityUtil.fetchAllActionResults(results, samlActions);
// Store the timestamp element
WSSecurityEngineResult tsResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.TS);
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1459859&r1=1459858&r2=1459859&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
(original)
+++
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Fri Mar 22 15:59:48 2013
@@ -381,9 +381,8 @@ public class WSS4JInInterceptor extends
SoapMessage msg, RequestData reqData, List<WSSecurityEngineResult>
wsResult
) throws WSSecurityException {
// Extract the signature action result from the action list
- List<WSSecurityEngineResult> signatureResults = new
ArrayList<WSSecurityEngineResult>();
- signatureResults =
- WSSecurityUtil.fetchAllActionResults(wsResult, WSConstants.SIGN,
signatureResults);
+ List<WSSecurityEngineResult> signatureResults =
+ WSSecurityUtil.fetchAllActionResults(wsResult, WSConstants.SIGN);
// Store the last signature result
if (!signatureResults.isEmpty()) {
@@ -395,9 +394,8 @@ public class WSS4JInInterceptor extends
SoapMessage msg, RequestData reqData, List<WSSecurityEngineResult>
wsResult
) throws WSSecurityException {
// Extract the timestamp action result from the action list
- List<WSSecurityEngineResult> timestampResults = new
ArrayList<WSSecurityEngineResult>();
- timestampResults =
- WSSecurityUtil.fetchAllActionResults(wsResult, WSConstants.TS,
timestampResults);
+ List<WSSecurityEngineResult> timestampResults =
+ WSSecurityUtil.fetchAllActionResults(wsResult, WSConstants.TS);
if (!timestampResults.isEmpty()) {
msg.put(TIMESTAMP_RESULT,
timestampResults.get(timestampResults.size() - 1));
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java?rev=1459859&r1=1459858&r2=1459859&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
(original)
+++
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JUtils.java
Fri Mar 22 15:59:48 2013
@@ -85,5 +85,4 @@ public final class WSS4JUtils {
return null;
}
-
}
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java?rev=1459859&r1=1459858&r2=1459859&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
(original)
+++
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
Fri Mar 22 15:59:48 2013
@@ -21,7 +21,6 @@ package org.apache.cxf.ws.security.wss4j
import java.security.PublicKey;
import java.security.cert.X509Certificate;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -85,8 +84,8 @@ public abstract class AbstractBindingPol
List<WSSecurityEngineResult> signedResults,
Message message
) {
- List<WSSecurityEngineResult> timestampResults = new
ArrayList<WSSecurityEngineResult>();
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.TS,
timestampResults);
+ List<WSSecurityEngineResult> timestampResults =
+ WSSecurityUtil.fetchAllActionResults(results, WSConstants.TS);
// Check whether we received a timestamp and compare it to the policy
if (includeTimestamp && timestampResults.size() != 1) {
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java?rev=1459859&r1=1459858&r2=1459859&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java
(original)
+++
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java
Fri Mar 22 15:59:48 2013
@@ -75,9 +75,11 @@ public class SamlTokenPolicyValidator ex
List<WSSecurityEngineResult> results,
List<WSSecurityEngineResult> signedResults
) {
- List<WSSecurityEngineResult> samlResults = new
ArrayList<WSSecurityEngineResult>();
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.ST_SIGNED,
samlResults);
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.ST_UNSIGNED,
samlResults);
+ final List<Integer> actions = new ArrayList<Integer>(2);
+ actions.add(WSConstants.ST_SIGNED);
+ actions.add(WSConstants.ST_UNSIGNED);
+ List<WSSecurityEngineResult> samlResults =
+ WSSecurityUtil.fetchAllActionResults(results, actions);
for (AssertionInfo ai : ais) {
SamlToken samlToken = (SamlToken)ai.getAssertion();
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java?rev=1459859&r1=1459858&r2=1459859&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java
(original)
+++
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java
Fri Mar 22 15:59:48 2013
@@ -19,7 +19,6 @@
package org.apache.cxf.ws.security.wss4j.policyvalidators;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -64,8 +63,8 @@ public class SecurityContextTokenPolicyV
Message message,
List<WSSecurityEngineResult> results
) {
- List<WSSecurityEngineResult> sctResults = new
ArrayList<WSSecurityEngineResult>();
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.SCT,
sctResults);
+ List<WSSecurityEngineResult> sctResults =
+ WSSecurityUtil.fetchAllActionResults(results, WSConstants.SCT);
for (AssertionInfo ai : ais) {
SecurityContextToken sctPolicy =
(SecurityContextToken)ai.getAssertion();
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java?rev=1459859&r1=1459858&r2=1459859&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java
(original)
+++
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java
Fri Mar 22 15:59:48 2013
@@ -71,9 +71,11 @@ public class UsernameTokenPolicyValidato
Message message,
List<WSSecurityEngineResult> results
) {
- List<WSSecurityEngineResult> utResults = new
ArrayList<WSSecurityEngineResult>();
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.UT,
utResults);
- WSSecurityUtil.fetchAllActionResults(results,
WSConstants.UT_NOPASSWORD, utResults);
+ final List<Integer> actions = new ArrayList<Integer>(2);
+ actions.add(WSConstants.UT);
+ actions.add(WSConstants.UT_NOPASSWORD);
+ List<WSSecurityEngineResult> utResults =
+ WSSecurityUtil.fetchAllActionResults(results, actions);
for (AssertionInfo ai : ais) {
org.apache.wss4j.policy.model.UsernameToken usernameTokenPolicy =
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java?rev=1459859&r1=1459858&r2=1459859&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java
(original)
+++
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java
Fri Mar 22 15:59:48 2013
@@ -19,7 +19,6 @@
package org.apache.cxf.ws.security.wss4j.policyvalidators;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -65,8 +64,8 @@ public class WSS11PolicyValidator
Message message,
List<WSSecurityEngineResult> results
) {
- List<WSSecurityEngineResult> scResults = new
ArrayList<WSSecurityEngineResult>();
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.SC,
scResults);
+ List<WSSecurityEngineResult> scResults =
+ WSSecurityUtil.fetchAllActionResults(results, WSConstants.SC);
for (AssertionInfo ai : ais) {
Wss11 wss11 = (Wss11)ai.getAssertion();
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java?rev=1459859&r1=1459858&r2=1459859&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java
(original)
+++
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java
Fri Mar 22 15:59:48 2013
@@ -19,7 +19,6 @@
package org.apache.cxf.ws.security.wss4j.policyvalidators;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -71,8 +70,8 @@ public class X509TokenPolicyValidator ex
Message message,
List<WSSecurityEngineResult> results
) {
- List<WSSecurityEngineResult> bstResults = new
ArrayList<WSSecurityEngineResult>();
- WSSecurityUtil.fetchAllActionResults(results, WSConstants.BST,
bstResults);
+ List<WSSecurityEngineResult> bstResults =
+ WSSecurityUtil.fetchAllActionResults(results, WSConstants.BST);
for (AssertionInfo ai : ais) {
X509Token x509TokenPolicy = (X509Token)ai.getAssertion();
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java?rev=1459859&r1=1459858&r2=1459859&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
(original)
+++
cxf/branches/wss4j2.0-port/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java
Fri Mar 22 15:59:48 2013
@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.Vector;
import java.util.concurrent.Executor;
import javax.xml.namespace.NamespaceContext;
@@ -446,9 +445,8 @@ public abstract class AbstractPolicySecu
assertNotNull(handlerResults);
assertSame(handlerResults.size(), 1);
- List<WSSecurityEngineResult> protectionResults = new
Vector<WSSecurityEngineResult>();
-
WSSecurityUtil.fetchAllActionResults(handlerResults.get(0).getResults(),
- WSConstants.ENCR, protectionResults);
+ List<WSSecurityEngineResult> protectionResults =
+
WSSecurityUtil.fetchAllActionResults(handlerResults.get(0).getResults(),
WSConstants.ENCR);
assertNotNull(protectionResults);
//
