You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ws.apache.org by co...@apache.org on 2010/11/12 18:32:11 UTC
svn commit: r1034484 [1/2] - /webservices/wss4j/trunk/test/wssec/
Author: coheigea
Date: Fri Nov 12 17:32:10 2010
New Revision: 1034484
URL: http://svn.apache.org/viewvc?rev=1034484&view=rev
Log:
[WSS-249] - Parameterize Collections in WSS4J 1.6
Modified:
webservices/wss4j/trunk/test/wssec/CustomCrypto.java
webservices/wss4j/trunk/test/wssec/MyHandler.java
webservices/wss4j/trunk/test/wssec/MyProcessor.java
webservices/wss4j/trunk/test/wssec/SignatureConfirmationTest.java
webservices/wss4j/trunk/test/wssec/SignatureKeyValueTest.java
webservices/wss4j/trunk/test/wssec/TestModifiedRequest.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef1.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityGetPassword.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityKerberosTokenProfile.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew17.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew18.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST2.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST3.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityResultsOrder.java
webservices/wss4j/trunk/test/wssec/TestWSSecuritySignatureParts.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityTimestamp.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityUTDK.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityUTSignature.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityUserProcessor.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS178.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS194.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS245.java
webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS40.java
Modified: webservices/wss4j/trunk/test/wssec/CustomCrypto.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/CustomCrypto.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/CustomCrypto.java (original)
+++ webservices/wss4j/trunk/test/wssec/CustomCrypto.java Fri Nov 12 17:32:10 2010
@@ -23,11 +23,11 @@ import org.apache.ws.security.components
public class CustomCrypto extends CryptoBase {
- java.util.Map config = null;
+ java.util.Map<String, Object> config = null;
public
CustomCrypto(
- java.util.Map config,
+ java.util.Map<String, Object> config,
java.lang.ClassLoader loader
) {
this.config = config;
Modified: webservices/wss4j/trunk/test/wssec/MyHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/MyHandler.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/MyHandler.java (original)
+++ webservices/wss4j/trunk/test/wssec/MyHandler.java Fri Nov 12 17:32:10 2010
@@ -19,6 +19,7 @@
package wssec;
+import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.handler.WSHandler;
import org.apache.ws.security.handler.RequestData;
import org.w3c.dom.Document;
@@ -32,7 +33,7 @@ import java.util.Map;
*/
public class MyHandler extends WSHandler {
- private Map optionsMap = new HashMap();
+ private Map<String, Object> optionsMap = new HashMap<String, Object>();
public Object
getOption(String key) {
@@ -44,19 +45,20 @@ public class MyHandler extends WSHandler
optionsMap.put(key, option);
}
+ @SuppressWarnings("unchecked")
public void
setProperty(
Object ctx,
String key,
Object value
) {
- ((java.util.Map)ctx).put(key, value);
+ ((java.util.Map<String, Object>)ctx).put(key, value);
}
public Object
getProperty(Object ctx, String key) {
- if (ctx instanceof java.util.Map) {
- return ((java.util.Map)ctx).get(key);
+ if (ctx instanceof java.util.Map<?,?>) {
+ return ((java.util.Map<?,?>)ctx).get(key);
}
return null;
}
@@ -67,8 +69,8 @@ public class MyHandler extends WSHandler
public String
getPassword(Object msgContext) {
- if (msgContext instanceof java.util.Map) {
- return (String)((java.util.Map)msgContext).get("password");
+ if (msgContext instanceof java.util.Map<?,?>) {
+ return (String)((java.util.Map<?,?>)msgContext).get("password");
}
return null;
}
@@ -77,7 +79,7 @@ public class MyHandler extends WSHandler
int action,
Document doc,
RequestData reqData,
- java.util.List actions,
+ java.util.List<Integer> actions,
boolean request
) throws org.apache.ws.security.WSSecurityException {
doSenderAction(
@@ -101,21 +103,21 @@ public class MyHandler extends WSHandler
public void signatureConfirmation(
RequestData requestData,
- java.util.List results
+ java.util.List<WSSecurityEngineResult> results
) throws org.apache.ws.security.WSSecurityException {
checkSignatureConfirmation(requestData, results);
}
public boolean checkResults(
- java.util.List results,
- java.util.List actions
+ java.util.List<WSSecurityEngineResult> results,
+ java.util.List<Integer> actions
) throws org.apache.ws.security.WSSecurityException {
return checkReceiverResults(results, actions);
}
public boolean checkResultsAnyOrder(
- java.util.List results,
- java.util.List actions
+ java.util.List<WSSecurityEngineResult> results,
+ java.util.List<Integer> actions
) throws org.apache.ws.security.WSSecurityException {
return checkReceiverResultsAnyOrder(results, actions);
}
Modified: webservices/wss4j/trunk/test/wssec/MyProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/MyProcessor.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/MyProcessor.java (original)
+++ webservices/wss4j/trunk/test/wssec/MyProcessor.java Fri Nov 12 17:32:10 2010
@@ -40,10 +40,10 @@ public class MyProcessor implements Proc
final Crypto decCrypto,
final javax.security.auth.callback.CallbackHandler cb,
final WSDocInfo wsDocInfo,
- final java.util.List returnResults,
+ final java.util.List<WSSecurityEngineResult> returnResults,
final WSSConfig config
) throws WSSecurityException {
- final java.util.Map result =
+ final WSSecurityEngineResult result =
new WSSecurityEngineResult(
WSConstants.UT_SIGN,
(SecurityContextToken) null
Modified: webservices/wss4j/trunk/test/wssec/SignatureConfirmationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/SignatureConfirmationTest.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/SignatureConfirmationTest.java (original)
+++ webservices/wss4j/trunk/test/wssec/SignatureConfirmationTest.java Fri Nov 12 17:32:10 2010
@@ -89,17 +89,18 @@ public class SignatureConfirmationTest e
/**
* Test to see that a signature is saved correctly on the outbound request.
*/
+ @SuppressWarnings("unchecked")
public void
testRequestSavedSignature() throws Exception {
final RequestData reqData = new RequestData();
- java.util.Map msgContext = new java.util.TreeMap();
+ java.util.Map<String, Object> msgContext = new java.util.TreeMap<String, Object>();
msgContext.put(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
msgContext.put(WSHandlerConstants.SIG_PROP_FILE, "crypto.properties");
msgContext.put("password", "security");
reqData.setMsgContext(msgContext);
reqData.setUsername("16c73ab6-b892-458f-abf5-2f875f74882e");
- final java.util.Vector actions = new java.util.Vector();
+ final java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.SIGN));
final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
MyHandler handler = new MyHandler();
@@ -113,8 +114,9 @@ public class SignatureConfirmationTest e
LOG.debug(outputString);
}
- msgContext = (java.util.Map)reqData.getMsgContext();
- List savedSignatures = (List)msgContext.get(WSHandlerConstants.SEND_SIGV);
+ msgContext = (java.util.Map<String, Object>)reqData.getMsgContext();
+ List<byte[]> savedSignatures =
+ (List<byte[]>)msgContext.get(WSHandlerConstants.SEND_SIGV);
assertTrue(savedSignatures != null && savedSignatures.size() == 1);
byte[] signatureValue = (byte[])savedSignatures.get(0);
assertTrue(signatureValue != null && signatureValue.length > 0);
@@ -125,17 +127,18 @@ public class SignatureConfirmationTest e
* Test to see that a signature is not saved on the outbound request if
* enable signature confirmation is false.
*/
+ @SuppressWarnings("unchecked")
public void
testRequestNotSavedSignature() throws Exception {
final RequestData reqData = new RequestData();
- java.util.Map msgContext = new java.util.TreeMap();
+ java.util.Map<String, Object> msgContext = new java.util.TreeMap<String, Object>();
msgContext.put(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, "false");
msgContext.put(WSHandlerConstants.SIG_PROP_FILE, "crypto.properties");
msgContext.put("password", "security");
reqData.setMsgContext(msgContext);
reqData.setUsername("16c73ab6-b892-458f-abf5-2f875f74882e");
- final java.util.Vector actions = new java.util.Vector();
+ final java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.SIGN));
final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
MyHandler handler = new MyHandler();
@@ -149,8 +152,9 @@ public class SignatureConfirmationTest e
LOG.debug(outputString);
}
- msgContext = (java.util.Map)reqData.getMsgContext();
- List savedSignatures = (List)msgContext.get(WSHandlerConstants.SEND_SIGV);
+ msgContext = (java.util.Map<String, Object>)reqData.getMsgContext();
+ List<byte[]> savedSignatures =
+ (List<byte[]>)msgContext.get(WSHandlerConstants.SEND_SIGV);
assertTrue(savedSignatures == null);
}
@@ -159,17 +163,18 @@ public class SignatureConfirmationTest e
* Test to see that a signature confirmation response is correctly sent on receiving
* a signed message.
*/
+ @SuppressWarnings("unchecked")
public void
testSignatureConfirmationResponse() throws Exception {
final RequestData reqData = new RequestData();
- java.util.Map msgContext = new java.util.TreeMap();
+ java.util.Map<String, Object> msgContext = new java.util.TreeMap<String, Object>();
msgContext.put(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
msgContext.put(WSHandlerConstants.SIG_PROP_FILE, "crypto.properties");
msgContext.put("password", "security");
reqData.setMsgContext(msgContext);
reqData.setUsername("16c73ab6-b892-458f-abf5-2f875f74882e");
- final java.util.Vector actions = new java.util.Vector();
+ final java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.SIGN));
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
MyHandler handler = new MyHandler();
@@ -183,8 +188,9 @@ public class SignatureConfirmationTest e
LOG.debug(outputString);
}
- msgContext = (java.util.Map)reqData.getMsgContext();
- List savedSignatures = (List)msgContext.get(WSHandlerConstants.SEND_SIGV);
+ msgContext = (java.util.Map<String, Object>)reqData.getMsgContext();
+ List<byte[]> savedSignatures =
+ (List<byte[]>)msgContext.get(WSHandlerConstants.SEND_SIGV);
assertTrue(savedSignatures != null && savedSignatures.size() == 1);
byte[] signatureValue = (byte[])savedSignatures.get(0);
assertTrue(signatureValue != null && signatureValue.length > 0);
@@ -192,12 +198,12 @@ public class SignatureConfirmationTest e
//
// Verify the inbound request, and create a response with a Signature Confirmation
//
- List results = verify(doc);
+ List<WSSecurityEngineResult> results = verify(doc);
actions.clear();
doc = SOAPUtil.toSOAPPart(SOAPMSG);
- msgContext = (java.util.Map)reqData.getMsgContext();
+ msgContext = (java.util.Map<String, Object>)reqData.getMsgContext();
WSHandlerResult handlerResult = new WSHandlerResult(null, results);
- List receivedResults = new Vector();
+ List<WSHandlerResult> receivedResults = new Vector<WSHandlerResult>();
receivedResults.add(handlerResult);
msgContext.put(WSHandlerConstants.RECV_RESULTS, receivedResults);
handler.send(
@@ -217,17 +223,18 @@ public class SignatureConfirmationTest e
/**
* Test to see that a signature confirmation response is correctly processed.
*/
+ @SuppressWarnings("unchecked")
public void
testSignatureConfirmationProcessing() throws Exception {
final RequestData reqData = new RequestData();
- java.util.Map msgContext = new java.util.TreeMap();
+ java.util.Map<String, Object> msgContext = new java.util.TreeMap<String, Object>();
msgContext.put(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
msgContext.put(WSHandlerConstants.SIG_PROP_FILE, "crypto.properties");
msgContext.put("password", "security");
reqData.setMsgContext(msgContext);
reqData.setUsername("16c73ab6-b892-458f-abf5-2f875f74882e");
- final java.util.Vector actions = new java.util.Vector();
+ final java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.SIGN));
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
MyHandler handler = new MyHandler();
@@ -244,12 +251,12 @@ public class SignatureConfirmationTest e
//
// Verify the inbound request, and create a response with a Signature Confirmation
//
- List results = verify(doc);
+ List<WSSecurityEngineResult> results = verify(doc);
actions.clear();
doc = SOAPUtil.toSOAPPart(SOAPMSG);
- msgContext = (java.util.Map)reqData.getMsgContext();
+ msgContext = (java.util.Map<String, Object>)reqData.getMsgContext();
WSHandlerResult handlerResult = new WSHandlerResult(null, results);
- List receivedResults = new Vector();
+ List<WSHandlerResult> receivedResults = new Vector<WSHandlerResult>();
receivedResults.add(handlerResult);
msgContext.put(WSHandlerConstants.RECV_RESULTS, receivedResults);
handler.send(
@@ -281,8 +288,9 @@ public class SignatureConfirmationTest e
* @param doc
* @throws Exception Thrown when there is a problem in verification
*/
- private List verify(Document doc) throws Exception {
- List results = secEngine.processSecurityHeader(doc, null, this, crypto);
+ private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
+ List<WSSecurityEngineResult> results =
+ secEngine.processSecurityHeader(doc, null, this, crypto);
if (LOG.isDebugEnabled()) {
LOG.debug("Verfied and decrypted message:");
String outputString =
Modified: webservices/wss4j/trunk/test/wssec/SignatureKeyValueTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/SignatureKeyValueTest.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/SignatureKeyValueTest.java (original)
+++ webservices/wss4j/trunk/test/wssec/SignatureKeyValueTest.java Fri Nov 12 17:32:10 2010
@@ -107,7 +107,7 @@ public class SignatureKeyValueTest exten
}
assertTrue(outputString.indexOf("RSAKeyValue") != -1);
- final List results = verify(signedDoc);
+ final List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
assertTrue(actionResult != null);
@@ -172,7 +172,7 @@ public class SignatureKeyValueTest exten
}
assertTrue(outputString.indexOf("DSAKeyValue") != -1);
- final List results = verify(signedDoc);
+ final List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
assertTrue(actionResult != null);
@@ -193,7 +193,7 @@ public class SignatureKeyValueTest exten
* @param env soap envelope
* @throws java.lang.Exception Thrown when there is a problem in verification
*/
- private List verify(Document doc) throws Exception {
+ private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
return secEngine.processSecurityHeader(doc, null, this, null);
}
Modified: webservices/wss4j/trunk/test/wssec/TestModifiedRequest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestModifiedRequest.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestModifiedRequest.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestModifiedRequest.java Fri Nov 12 17:32:10 2010
@@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFac
import org.apache.ws.security.WSEncryptionPart;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
-// import org.apache.ws.security.WSSecurityEngineResult;
+import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.components.crypto.CryptoFactory;
import org.apache.ws.security.message.WSSecSignature;
@@ -98,7 +98,7 @@ public class TestModifiedRequest extends
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart(
"value",
@@ -227,7 +227,7 @@ public class TestModifiedRequest extends
* @param env soap envelope
* @throws java.lang.Exception Thrown when there is a problem in verification
*/
- private List verify(Document doc) throws Exception {
+ private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
return secEngine.processSecurityHeader(doc, null, this, crypto);
}
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef.java Fri Nov 12 17:32:10 2010
@@ -120,7 +120,7 @@ public class TestWSSecurityDataRef exten
/*
* Set up the parts structure to encrypt the body
*/
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP = new WSEncryptionPart("testMethod", "uri:LogTestService2",
"Element");
parts.add(encP);
@@ -155,14 +155,15 @@ public class TestWSSecurityDataRef exten
* @throws Exception
* Thrown when there is a problem in verification
*/
+ @SuppressWarnings("unchecked")
private void checkDataRef(Document doc) throws Exception {
// Retrieve the wsResults List
- List wsResults = secEngine.processSecurityHeader(doc, null, this, crypto);
+ List<WSSecurityEngineResult> wsResults =
+ secEngine.processSecurityHeader(doc, null, this, crypto);
boolean found = false;
for (int i = 0; i < wsResults.size(); i++) {
-
WSSecurityEngineResult wsSecEngineResult =
(WSSecurityEngineResult)wsResults.get(i);
int action = ((java.lang.Integer)
@@ -172,8 +173,8 @@ public class TestWSSecurityDataRef exten
if (action != WSConstants.ENCR) {
continue;
}
- List dataRefs = (List)wsSecEngineResult
- .get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
+ List<WSDataRef> dataRefs =
+ (List<WSDataRef>)wsSecEngineResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
//We want check only the DATA_REF_URIS
if (dataRefs != null && dataRefs.size() > 0) {
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef1.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef1.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef1.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityDataRef1.java Fri Nov 12 17:32:10 2010
@@ -121,7 +121,7 @@ public class TestWSSecurityDataRef1 exte
/*
* Set up the parts structure to encrypt the body
*/
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP = new WSEncryptionPart("testMethod", "uri:LogTestService2",
"Element");
parts.add(encP);
@@ -160,14 +160,15 @@ public class TestWSSecurityDataRef1 exte
* @throws Exception
* Thrown when there is a problem in verification
*/
+ @SuppressWarnings("unchecked")
private void checkDataRef(Document doc) throws Exception {
// Retrieve the wsResults List
- List wsResults = secEngine.processSecurityHeader(doc, null, this, crypto);
+ List<WSSecurityEngineResult> wsResults =
+ secEngine.processSecurityHeader(doc, null, this, crypto);
boolean found = false;
for (int i = 0; i < wsResults.size(); i++) {
-
WSSecurityEngineResult wsSecEngineResult =
(WSSecurityEngineResult)wsResults.get(i);
int action = ((java.lang.Integer)
@@ -177,7 +178,7 @@ public class TestWSSecurityDataRef1 exte
if (action != WSConstants.ENCR) {
continue;
}
- List dataRefs = (List)wsSecEngineResult
+ List<WSDataRef> dataRefs = (List<WSDataRef>)wsSecEngineResult
.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
//We want check only the DATA_REF_URIS
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityEncryptionParts.java Fri Nov 12 17:32:10 2010
@@ -91,6 +91,7 @@ public class TestWSSecurityEncryptionPar
/**
* Test encrypting a custom SOAP header
*/
+ @SuppressWarnings("unchecked")
public void testSOAPHeader() throws Exception {
WSSecEncrypt encrypt = new WSSecEncrypt();
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -100,7 +101,7 @@ public class TestWSSecurityEncryptionPar
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart(
"foobar",
@@ -117,7 +118,7 @@ public class TestWSSecurityEncryptionPar
LOG.debug(outputString);
}
- List results = verify(encryptedDoc);
+ List<WSSecurityEngineResult> results = verify(encryptedDoc);
QName name = new QName("urn:foo.bar", "foobar");
WSSecurityUtil.checkAllElementsProtected(results, WSConstants.ENCR, new QName[]{name});
@@ -140,8 +141,8 @@ public class TestWSSecurityEncryptionPar
WSSecurityUtil.fetchActionResult(results, WSConstants.ENCR);
assertTrue(actionResult != null);
assertFalse(actionResult.isEmpty());
- final java.util.List refs =
- (java.util.List) actionResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
+ final java.util.List<WSDataRef> refs =
+ (java.util.List<WSDataRef>) actionResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
assertEquals(WSConstants.KEYTRANSPORT_RSA15,
actionResult.get(WSSecurityEngineResult.TAG_ENCRYPTED_KEY_TRANSPORT_METHOD));
@@ -156,6 +157,7 @@ public class TestWSSecurityEncryptionPar
/**
* Test encrypting a custom SOAP header using wsse11:EncryptedHeader
*/
+ @SuppressWarnings("unchecked")
public void testSOAPEncryptedHeader() throws Exception {
WSSecEncrypt encrypt = new WSSecEncrypt();
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -165,7 +167,7 @@ public class TestWSSecurityEncryptionPar
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart(
"foobar",
@@ -184,14 +186,14 @@ public class TestWSSecurityEncryptionPar
assertTrue(outputString.indexOf("wsse11:EncryptedHeader") != -1);
assertTrue(outputString.indexOf("foo:foobar") == -1);
- List results = verify(encryptedDoc);
+ List<WSSecurityEngineResult> results = verify(encryptedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ENCR);
assertTrue(actionResult != null);
assertFalse(actionResult.isEmpty());
- final java.util.List refs =
- (java.util.List) actionResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
+ final java.util.List<WSDataRef> refs =
+ (java.util.List<WSDataRef>) actionResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
assertEquals(WSConstants.KEYTRANSPORT_RSA15,
actionResult.get(WSSecurityEngineResult.TAG_ENCRYPTED_KEY_TRANSPORT_METHOD));
@@ -214,7 +216,7 @@ public class TestWSSecurityEncryptionPar
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart(
"foobar2",
@@ -245,7 +247,7 @@ public class TestWSSecurityEncryptionPar
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart(
"foobar",
@@ -277,7 +279,7 @@ public class TestWSSecurityEncryptionPar
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart(
soapConstants.getBodyQName().getLocalPart(), // define the body
@@ -300,7 +302,7 @@ public class TestWSSecurityEncryptionPar
LOG.debug(outputString);
}
- List results = verify(encryptedDoc);
+ List<WSSecurityEngineResult> results = verify(encryptedDoc);
QName fooName = new QName("urn:foo.bar", "foobar");
QName bodyName = new QName(soapConstants.getEnvelopeURI(), "Body");
@@ -346,8 +348,9 @@ public class TestWSSecurityEncryptionPar
* @param doc
* @throws Exception Thrown when there is a problem in verification
*/
- private List verify(Document doc) throws Exception {
- List results = secEngine.processSecurityHeader(doc, null, this, null, crypto);
+ private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
+ List<WSSecurityEngineResult> results =
+ secEngine.processSecurityHeader(doc, null, this, null, crypto);
if (LOG.isDebugEnabled()) {
LOG.debug("Verified and decrypted message:");
String outputString =
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityGetPassword.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityGetPassword.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityGetPassword.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityGetPassword.java Fri Nov 12 17:32:10 2010
@@ -89,7 +89,7 @@ public class TestWSSecurityGetPassword e
final WSSConfig cfg = WSSConfig.getNewInstance();
final RequestData reqData = new RequestData();
reqData.setWssConfig(cfg);
- java.util.Map messageContext = new java.util.TreeMap();
+ java.util.Map<String, Object> messageContext = new java.util.TreeMap<String, Object>();
messageContext.put("password", "securityPassword");
reqData.setMsgContext(messageContext);
@@ -119,11 +119,11 @@ public class TestWSSecurityGetPassword e
reqData.setWssConfig(cfg);
reqData.setUsername("bob");
reqData.setPwType(WSConstants.PASSWORD_TEXT);
- java.util.Map messageContext = new java.util.TreeMap();
+ java.util.Map<String, Object> messageContext = new java.util.TreeMap<String, Object>();
messageContext.put("password", "securityPassword");
reqData.setMsgContext(messageContext);
- final java.util.Vector actions = new java.util.Vector();
+ final java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.UT));
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
MyHandler handler = new MyHandler();
@@ -157,14 +157,14 @@ public class TestWSSecurityGetPassword e
reqData.setWssConfig(cfg);
reqData.setUsername("bob");
reqData.setPwType(WSConstants.PASSWORD_TEXT);
- java.util.Map messageContext = new java.util.TreeMap();
+ java.util.Map<String, Object> messageContext = new java.util.TreeMap<String, Object>();
messageContext.put(
WSHandlerConstants.PW_CALLBACK_REF,
new MyCallbackHandler()
);
reqData.setMsgContext(messageContext);
- final java.util.Vector actions = new java.util.Vector();
+ final java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.UT));
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
MyHandler handler = new MyHandler();
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityKerberosTokenProfile.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityKerberosTokenProfile.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityKerberosTokenProfile.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityKerberosTokenProfile.java Fri Nov 12 17:32:10 2010
@@ -139,7 +139,7 @@ public class TestWSSecurityKerberosToken
sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
sign.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- Vector parts = new Vector();
+ java.util.List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart(bst.getID());
parts.add(encP);
@@ -181,7 +181,7 @@ public class TestWSSecurityKerberosToken
sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
sign.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- Vector parts = new Vector();
+ java.util.List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
parts.add(new WSEncryptionPart(bst.getID()));
parts.add(new WSEncryptionPart(timestamp.getId()));
sign.setParts(parts);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew.java Fri Nov 12 17:32:10 2010
@@ -137,7 +137,7 @@ public class TestWSSecurityNew extends T
* Ensure that we can load a custom crypto implementation using a Map
*/
public void testCustomCrypto() {
- java.util.Map tmp = new java.util.TreeMap();
+ java.util.Map<String, Object> tmp = new java.util.TreeMap<String, Object>();
Crypto crypto = CryptoFactory.getInstance(
"wssec.CustomCrypto",
tmp
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java Fri Nov 12 17:32:10 2010
@@ -98,7 +98,7 @@ public class TestWSSecurityNew11 extends
builder.setUserInfo("wss40", "security");
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
//
// Set up to sign body and use STRTransform to sign
@@ -147,7 +147,7 @@ public class TestWSSecurityNew11 extends
builder.setUserInfo("wss40", "security");
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
@@ -206,7 +206,7 @@ public class TestWSSecurityNew11 extends
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
//
// Set up to sign body and use STRTransform to sign
@@ -259,7 +259,7 @@ public class TestWSSecurityNew11 extends
builder.setUserInfo("wss40", "security");
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
//
// Set up to sign body and use STRTransform to sign
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java Fri Nov 12 17:32:10 2010
@@ -190,7 +190,7 @@ public class TestWSSecurityNew13 extends
RequestData reqData = new RequestData();
reqData.setWssConfig(WSSConfig.getNewInstance());
- java.util.Map config = new java.util.TreeMap();
+ java.util.Map<String, Object> config = new java.util.TreeMap<String, Object>();
config.put("password", "verySecret");
config.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
config.put(WSHandlerConstants.WSE_SECRET_KEY_LENGTH, "32");
@@ -198,7 +198,7 @@ public class TestWSSecurityNew13 extends
reqData.setUsername("wernerd");
reqData.setMsgContext(config);
- java.util.Vector actions = new java.util.Vector();
+ java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.UT_SIGN));
handler.send(WSConstants.UT_SIGN, doc, reqData, actions, true);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java Fri Nov 12 17:32:10 2010
@@ -294,14 +294,14 @@ public class TestWSSecurityNew14 extends
final WSSConfig cfg = WSSConfig.getNewInstance();
final RequestData reqData = new RequestData();
reqData.setWssConfig(cfg);
- java.util.Map messageContext = new java.util.TreeMap();
+ java.util.Map<String, Object> messageContext = new java.util.TreeMap<String, Object>();
messageContext.put(WSHandlerConstants.ENC_SYM_ENC_KEY, "false");
messageContext.put(WSHandlerConstants.ENC_KEY_ID, "EncryptedKeySHA1");
messageContext.put(WSHandlerConstants.PW_CALLBACK_REF, this);
reqData.setMsgContext(messageContext);
reqData.setUsername("");
- final java.util.Vector actions = new java.util.Vector();
+ final java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.ENCR));
final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
MyHandler handler = new MyHandler();
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew15.java Fri Nov 12 17:32:10 2010
@@ -127,7 +127,7 @@ public class TestWSSecurityNew15 extends
*/
SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(doc
.getDocumentElement());
- Vector parts = new Vector();
+ java.util.List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP = new WSEncryptionPart(soapConstants
.getBodyQName().getLocalPart(), soapConstants.getEnvelopeURI(),
"Content");
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew17.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew17.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew17.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew17.java Fri Nov 12 17:32:10 2010
@@ -223,14 +223,14 @@ public class TestWSSecurityNew17 extends
final WSSConfig cfg = WSSConfig.getNewInstance();
RequestData reqData = new RequestData();
reqData.setWssConfig(cfg);
- java.util.Map messageContext = new java.util.TreeMap();
+ java.util.Map<String, Object> messageContext = new java.util.TreeMap<String, Object>();
messageContext.put(WSHandlerConstants.SIG_KEY_ID, "EncryptedKeySHA1");
messageContext.put(WSHandlerConstants.SIG_ALGO, SignatureMethod.HMAC_SHA1);
messageContext.put(WSHandlerConstants.PW_CALLBACK_REF, this);
reqData.setMsgContext(messageContext);
reqData.setUsername("");
- final java.util.Vector actions = new java.util.Vector();
+ final java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.SIGN));
final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
MyHandler handler = new MyHandler();
@@ -250,7 +250,7 @@ public class TestWSSecurityNew17 extends
reqData = new RequestData();
reqData.setWssConfig(WSSConfig.getNewInstance());
- messageContext = new java.util.TreeMap();
+ messageContext = new java.util.TreeMap<String, Object>();
messageContext.put(WSHandlerConstants.PW_CALLBACK_REF, this);
reqData.setMsgContext(messageContext);
reqData.setUsername("");
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew18.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew18.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew18.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew18.java Fri Nov 12 17:32:10 2010
@@ -149,7 +149,7 @@ public class TestWSSecurityNew18 extends
* Ensure that we can load a custom crypto implementation using a Map
*/
public void testCustomCrypto() {
- java.util.Map tmp = new java.util.TreeMap();
+ java.util.Map<String, Object> tmp = new java.util.TreeMap<String, Object>();
Crypto crypto = CryptoFactory.getInstance(
"wssec.CustomCrypto",
tmp
@@ -170,7 +170,7 @@ public class TestWSSecurityNew18 extends
final RequestData reqData = new RequestData();
reqData.setWssConfig(cfg);
reqData.setUsername("16c73ab6-b892-458f-abf5-2f875f74882e");
- java.util.Map config = new java.util.TreeMap();
+ java.util.Map<String, Object> config = new java.util.TreeMap<String, Object>();
config.put(WSHandlerConstants.SIG_PROP_FILE, "crypto.properties");
config.put("password", "security");
config.put(
@@ -183,7 +183,7 @@ public class TestWSSecurityNew18 extends
);
reqData.setMsgContext(config);
- final java.util.Vector actions = new java.util.Vector();
+ final java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(action));
final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
MyHandler handler = new MyHandler();
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew2.java Fri Nov 12 17:32:10 2010
@@ -127,7 +127,7 @@ public class TestWSSecurityNew2 extends
*/
builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
builder.setSymmetricEncAlgorithm(WSConstants.AES_128);
- Vector parts = new Vector();
+ java.util.List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart("testMethod", "uri:LogTestService2", "Element");
parts.add(encP);
@@ -192,11 +192,12 @@ public class TestWSSecurityNew2 extends
* @param envelope
* @throws Exception Thrown when there is a problem in verification
*/
+ @SuppressWarnings("unchecked")
private void verify(
Document doc,
javax.xml.namespace.QName expectedEncryptedElement
) throws Exception {
- final java.util.List results =
+ final java.util.List<WSSecurityEngineResult> results =
secEngine.processSecurityHeader(doc, null, this, null, crypto);
String outputString =
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
@@ -210,17 +211,18 @@ public class TestWSSecurityNew2 extends
// (as a QName)
//
boolean encrypted = false;
- for (java.util.Iterator ipos = results.iterator(); ipos.hasNext();) {
- final java.util.Map result = (java.util.Map) ipos.next();
+ for (java.util.Iterator<WSSecurityEngineResult> ipos = results.iterator();
+ ipos.hasNext();) {
+ final WSSecurityEngineResult result = ipos.next();
final Integer action = (Integer) result.get(WSSecurityEngineResult.TAG_ACTION);
assertNotNull(action);
if ((action.intValue() & WSConstants.ENCR) != 0) {
- final java.util.List refs =
- (java.util.List) result.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
+ final java.util.List<WSDataRef> refs =
+ (java.util.List<WSDataRef>) result.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
assertNotNull(refs);
encrypted = true;
- for (java.util.Iterator jpos = refs.iterator(); jpos.hasNext();) {
- final WSDataRef ref = (WSDataRef) jpos.next();
+ for (java.util.Iterator<WSDataRef> jpos = refs.iterator(); jpos.hasNext();) {
+ final WSDataRef ref = jpos.next();
assertNotNull(ref);
assertNotNull(ref.getName());
assertEquals(
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew3.java Fri Nov 12 17:32:10 2010
@@ -268,7 +268,7 @@ public class TestWSSecurityNew3 extends
timestamp.setTimeToLive(300);
Document createdDoc = timestamp.build(doc, secHeader);
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart(
"Timestamp",
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew5.java Fri Nov 12 17:32:10 2010
@@ -641,13 +641,13 @@ public class TestWSSecurityNew5 extends
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
RequestData reqData = new RequestData();
- java.util.Map config = new java.util.TreeMap();
+ java.util.Map<String, Object> config = new java.util.TreeMap<String, Object>();
config.put("password", "verySecret");
config.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
reqData.setUsername("wernerd");
reqData.setMsgContext(config);
- java.util.Vector actions = new java.util.Vector();
+ java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.UT));
handler.send(WSConstants.UT, doc, reqData, actions, true);
@@ -668,13 +668,13 @@ public class TestWSSecurityNew5 extends
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
RequestData reqData = new RequestData();
- java.util.Map config = new java.util.TreeMap();
+ java.util.Map<String, Object> config = new java.util.TreeMap<String, Object>();
config.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
config.put(WSHandlerConstants.PW_CALLBACK_REF, this);
reqData.setUsername("emptyuser");
reqData.setMsgContext(config);
- java.util.Vector actions = new java.util.Vector();
+ java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.UT));
handler.send(WSConstants.UT, doc, reqData, actions, true);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew6.java Fri Nov 12 17:32:10 2010
@@ -136,6 +136,7 @@ public class TestWSSecurityNew6 extends
* Thrown when there is any problem in signing, encryption,
* decryption, or verification
*/
+ @SuppressWarnings("unchecked")
public void testEncryptionElementSigning() throws Exception {
WSSecEncrypt encrypt = new WSSecEncrypt();
WSSecSignature sign = new WSSecSignature();
@@ -147,7 +148,7 @@ public class TestWSSecurityNew6 extends
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- List encParts = new Vector();
+ List<WSEncryptionPart> encParts = new Vector<WSEncryptionPart>();
encParts.add(
new WSEncryptionPart(
"add",
@@ -164,7 +165,7 @@ public class TestWSSecurityNew6 extends
LOG.debug(outputString);
}
- List sigParts = new Vector();
+ List<WSEncryptionPart> sigParts = new Vector<WSEncryptionPart>();
sigParts.add(
new WSEncryptionPart(
WSConstants.ENC_DATA_LN,
@@ -181,24 +182,26 @@ public class TestWSSecurityNew6 extends
LOG.debug(outputString);
}
- Vector results = verify(encryptedSignedDoc);
+ List<WSSecurityEngineResult> results = verify(encryptedSignedDoc);
- Vector sigSecEngResults = new Vector();
- WSSecurityUtil.fetchAllActionResults(results,
- WSConstants.SIGN, sigSecEngResults);
-
- Vector encSecEngResults = new Vector();
- WSSecurityUtil.fetchAllActionResults(results,
- WSConstants.ENCR, encSecEngResults);
+ List<WSSecurityEngineResult> sigSecEngResults = new Vector<WSSecurityEngineResult>();
+ WSSecurityUtil.fetchAllActionResults(results, WSConstants.SIGN, sigSecEngResults);
+
+ List<WSSecurityEngineResult> encSecEngResults = new Vector<WSSecurityEngineResult>();
+ WSSecurityUtil.fetchAllActionResults(results, WSConstants.ENCR, encSecEngResults);
assertEquals(1, sigSecEngResults.size());
assertEquals(1, encSecEngResults.size());
- List sigDataRefs = (List) ((WSSecurityEngineResult) sigSecEngResults.get(0))
- .get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
-
- List encDataRefs = (List) ((WSSecurityEngineResult) encSecEngResults.get(0))
- .get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
+ List<WSDataRef> sigDataRefs =
+ (List<WSDataRef>)(sigSecEngResults.get(0)).get(
+ WSSecurityEngineResult.TAG_DATA_REF_URIS
+ );
+
+ List<WSDataRef> encDataRefs =
+ (List<WSDataRef>)(encSecEngResults.get(0)).get(
+ WSSecurityEngineResult.TAG_DATA_REF_URIS
+ );
assertNotNull(sigDataRefs);
assertNotNull(encDataRefs);
@@ -252,7 +255,7 @@ public class TestWSSecurityNew6 extends
LOG.info("Before Encryption....");
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart(
"add",
@@ -286,15 +289,16 @@ public class TestWSSecurityNew6 extends
* @throws Exception
* Thrown when there is a problem in verification
*/
- private Vector verify(Document doc) throws Exception {
- List resultList = secEngine.processSecurityHeader(doc, null, this, crypto);
+ private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
+ List<WSSecurityEngineResult> resultList =
+ secEngine.processSecurityHeader(doc, null, this, crypto);
if (LOG.isDebugEnabled()) {
String outputString =
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
LOG.debug(outputString);
}
- return new Vector(resultList);
+ return resultList;
}
public void handle(Callback[] callbacks) throws IOException,
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewSCT.java Fri Nov 12 17:32:10 2010
@@ -21,7 +21,8 @@ package wssec;
import java.io.IOException;
import java.security.SecureRandom;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -72,7 +73,7 @@ public class TestWSSecurityNewSCT extend
/**
* Table of secrets indexed by the sct identifiers
*/
- private Hashtable secrets = new Hashtable();
+ private Map<String, byte[]> secrets = new HashMap<String, byte[]>();
/**
* @param arg0
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST1.java Fri Nov 12 17:32:10 2010
@@ -103,7 +103,7 @@ public class TestWSSecurityNewST1 extend
LOG.debug(outputString);
}
- List results = verify(unsignedDoc);
+ List<WSSecurityEngineResult> results = verify(unsignedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
SAMLAssertion receivedAssertion =
@@ -118,8 +118,9 @@ public class TestWSSecurityNewST1 extend
* @param envelope
* @throws Exception Thrown when there is a problem in verification
*/
- private List verify(Document doc) throws Exception {
- List results = secEngine.processSecurityHeader(doc, null, null, null);
+ private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
+ List<WSSecurityEngineResult> results =
+ secEngine.processSecurityHeader(doc, null, null, null);
String outputString =
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("LogTestService2") > 0 ? true : false);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST2.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST2.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST2.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST2.java Fri Nov 12 17:32:10 2010
@@ -121,7 +121,7 @@ public class TestWSSecurityNewST2 extend
LOG.debug(outputString);
}
- List results = verify(signedDoc);
+ List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
SAMLAssertion receivedAssertion =
@@ -163,7 +163,7 @@ public class TestWSSecurityNewST2 extend
LOG.debug(outputString);
}
- List results = verify(signedDoc);
+ List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
SAMLAssertion receivedAssertion =
@@ -206,7 +206,7 @@ public class TestWSSecurityNewST2 extend
LOG.debug(outputString);
}
- List results = verify(signedDoc);
+ List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
SAMLAssertion receivedAssertion =
@@ -246,8 +246,7 @@ public class TestWSSecurityNewST2 extend
final WSSConfig cfg = WSSConfig.getNewInstance();
final RequestData reqData = new RequestData();
reqData.setWssConfig(cfg);
- reqData.setMsgContext(new java.util.TreeMap());
- java.util.Map msgContext = new java.util.HashMap();
+ java.util.Map<String, Object> msgContext = new java.util.HashMap<String, Object>();
msgContext.put(WSHandlerConstants.SIG_PROP_FILE, "crypto.properties");
reqData.setMsgContext(msgContext);
@@ -280,8 +279,9 @@ public class TestWSSecurityNewST2 extend
* @param doc
* @throws Exception Thrown when there is a problem in verification
*/
- private List verify(Document doc) throws Exception {
- List results = secEngine.processSecurityHeader(doc, null, this, crypto);
+ private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
+ List<WSSecurityEngineResult> results =
+ secEngine.processSecurityHeader(doc, null, this, crypto);
String outputString =
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("LogTestService2") > 0 ? true : false);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST3.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST3.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST3.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewST3.java Fri Nov 12 17:32:10 2010
@@ -128,7 +128,7 @@ public class TestWSSecurityNewST3 extend
assertTrue(outputString.indexOf("http://www.w3.org/2001/04/xmlenc#sha256") != -1);
assertTrue(outputString.indexOf("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256") != -1);
- List results = verify(signedDoc);
+ List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
SAMLAssertion receivedAssertion =
@@ -177,7 +177,7 @@ public class TestWSSecurityNewST3 extend
assertTrue(outputString.indexOf("http://www.w3.org/2001/04/xmlenc#sha256") != -1);
assertTrue(outputString.indexOf("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256") != -1);
- List results = verify(signedDoc);
+ List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
SAMLAssertion receivedAssertion =
@@ -223,7 +223,7 @@ public class TestWSSecurityNewST3 extend
LOG.debug(outputString);
}
- List results = verify(signedDoc);
+ List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
SAMLAssertion receivedAssertion =
@@ -238,8 +238,9 @@ public class TestWSSecurityNewST3 extend
* @param envelope
* @throws Exception Thrown when there is a problem in verification
*/
- private List verify(Document doc) throws Exception {
- List results = secEngine.processSecurityHeader(doc, null, this, crypto);
+ private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
+ List<WSSecurityEngineResult> results =
+ secEngine.processSecurityHeader(doc, null, this, crypto);
String outputString =
org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
assertTrue(outputString.indexOf("LogTestService2") > 0 ? true : false);
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityResultsOrder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityResultsOrder.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityResultsOrder.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityResultsOrder.java Fri Nov 12 17:32:10 2010
@@ -58,7 +58,7 @@ public class TestWSSecurityResultsOrder
testOrder() throws Exception {
MyHandler handler = new MyHandler();
- java.util.List results = new java.util.Vector();
+ java.util.List<WSSecurityEngineResult> results = new java.util.Vector<WSSecurityEngineResult>();
results.add(
new WSSecurityEngineResult(WSConstants.UT, (Object)null)
);
@@ -72,7 +72,7 @@ public class TestWSSecurityResultsOrder
new WSSecurityEngineResult(WSConstants.SIGN, (Object)null)
);
- java.util.List actions = new java.util.Vector();
+ java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.UT));
actions.add(new Integer(WSConstants.TS));
actions.add(new Integer(WSConstants.SIGN));
@@ -87,7 +87,7 @@ public class TestWSSecurityResultsOrder
testReverseOrder() throws Exception {
MyHandler handler = new MyHandler();
- java.util.List results = new java.util.Vector();
+ java.util.List<WSSecurityEngineResult> results = new java.util.Vector<WSSecurityEngineResult>();
results.add(
new WSSecurityEngineResult(WSConstants.SIGN, (Object)null)
);
@@ -101,7 +101,7 @@ public class TestWSSecurityResultsOrder
new WSSecurityEngineResult(WSConstants.UT, (Object)null)
);
- java.util.List actions = new java.util.Vector();
+ java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.UT));
actions.add(new Integer(WSConstants.TS));
actions.add(new Integer(WSConstants.SIGN));
@@ -117,7 +117,8 @@ public class TestWSSecurityResultsOrder
testMixedOrder() throws Exception {
MyHandler handler = new MyHandler();
- java.util.List results = new java.util.Vector();
+ java.util.List<WSSecurityEngineResult> results =
+ new java.util.Vector<WSSecurityEngineResult>();
results.add(
new WSSecurityEngineResult(WSConstants.TS, (Object)null)
);
@@ -131,7 +132,7 @@ public class TestWSSecurityResultsOrder
new WSSecurityEngineResult(WSConstants.UT, (Object)null)
);
- java.util.List actions = new java.util.Vector();
+ java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.UT));
actions.add(new Integer(WSConstants.TS));
actions.add(new Integer(WSConstants.SIGN));
@@ -147,7 +148,8 @@ public class TestWSSecurityResultsOrder
testMixedOrder2() throws Exception {
MyHandler handler = new MyHandler();
- java.util.List results = new java.util.Vector();
+ java.util.List<WSSecurityEngineResult> results =
+ new java.util.Vector<WSSecurityEngineResult>();
results.add(
new WSSecurityEngineResult(WSConstants.TS, (Object)null)
);
@@ -161,7 +163,7 @@ public class TestWSSecurityResultsOrder
new WSSecurityEngineResult(WSConstants.UT, (Object)null)
);
- java.util.List actions = new java.util.Vector();
+ java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.SIGN));
actions.add(new Integer(WSConstants.UT));
actions.add(new Integer(WSConstants.TS));
@@ -176,7 +178,8 @@ public class TestWSSecurityResultsOrder
testMissingResult() throws Exception {
MyHandler handler = new MyHandler();
- java.util.List results = new java.util.Vector();
+ java.util.List<WSSecurityEngineResult> results =
+ new java.util.Vector<WSSecurityEngineResult>();
results.add(
new WSSecurityEngineResult(WSConstants.UT, (Object)null)
);
@@ -187,7 +190,7 @@ public class TestWSSecurityResultsOrder
new WSSecurityEngineResult(WSConstants.SC, (Object)null)
);
- java.util.List actions = new java.util.Vector();
+ java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.TS));
actions.add(new Integer(WSConstants.UT));
actions.add(new Integer(WSConstants.SIGN));
@@ -202,7 +205,8 @@ public class TestWSSecurityResultsOrder
testMissingAction() throws Exception {
MyHandler handler = new MyHandler();
- java.util.List results = new java.util.Vector();
+ java.util.List<WSSecurityEngineResult> results =
+ new java.util.Vector<WSSecurityEngineResult>();
results.add(
new WSSecurityEngineResult(WSConstants.UT, (Object)null)
);
@@ -216,7 +220,7 @@ public class TestWSSecurityResultsOrder
new WSSecurityEngineResult(WSConstants.SC, (Object)null)
);
- java.util.List actions = new java.util.Vector();
+ java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.TS));
actions.add(new Integer(WSConstants.UT));
@@ -230,9 +234,10 @@ public class TestWSSecurityResultsOrder
testNoResult() throws Exception {
MyHandler handler = new MyHandler();
- java.util.List results = new java.util.Vector();
+ java.util.List<WSSecurityEngineResult> results =
+ new java.util.Vector<WSSecurityEngineResult>();
- java.util.List actions = new java.util.Vector();
+ java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.TS));
assertFalse (handler.checkResults(results, actions));
@@ -245,12 +250,13 @@ public class TestWSSecurityResultsOrder
testNoAction() throws Exception {
MyHandler handler = new MyHandler();
- java.util.List results = new java.util.Vector();
+ java.util.List<WSSecurityEngineResult> results =
+ new java.util.Vector<WSSecurityEngineResult>();
results.add(
new WSSecurityEngineResult(WSConstants.TS, (Object)null)
);
- java.util.List actions = new java.util.Vector();
+ java.util.List<Integer> actions = new java.util.Vector<Integer>();
assertFalse (handler.checkResults(results, actions));
assertFalse (handler.checkResultsAnyOrder(results, actions));
@@ -262,7 +268,8 @@ public class TestWSSecurityResultsOrder
testMultipleIdenticalResults() throws Exception {
MyHandler handler = new MyHandler();
- java.util.List results = new java.util.Vector();
+ java.util.List<WSSecurityEngineResult> results =
+ new java.util.Vector<WSSecurityEngineResult>();
results.add(
new WSSecurityEngineResult(WSConstants.ENCR, (Object)null)
);
@@ -273,7 +280,7 @@ public class TestWSSecurityResultsOrder
new WSSecurityEngineResult(WSConstants.ENCR, (Object)null)
);
- java.util.List actions = new java.util.Vector();
+ java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.ENCR));
actions.add(new Integer(WSConstants.UT));
actions.add(new Integer(WSConstants.UT));
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecuritySignatureParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecuritySignatureParts.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecuritySignatureParts.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecuritySignatureParts.java Fri Nov 12 17:32:10 2010
@@ -93,6 +93,7 @@ public class TestWSSecuritySignaturePart
/**
* Test signing a custom SOAP header
*/
+ @SuppressWarnings("unchecked")
public void testSOAPHeader() throws Exception {
WSSecSignature sign = new WSSecSignature();
sign.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
@@ -103,7 +104,7 @@ public class TestWSSecuritySignaturePart
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart(
"foobar",
@@ -120,7 +121,7 @@ public class TestWSSecuritySignaturePart
LOG.debug(outputString);
}
- List results = verify(signedDoc);
+ List<WSSecurityEngineResult> results = verify(signedDoc);
QName name = new QName("urn:foo.bar", "foobar");
WSSecurityUtil.checkAllElementsProtected(results, WSConstants.SIGN, new QName[]{name});
@@ -143,8 +144,8 @@ public class TestWSSecuritySignaturePart
WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
assertTrue(actionResult != null);
assertFalse(actionResult.isEmpty());
- final java.util.List refs =
- (java.util.List) actionResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
+ final List<WSDataRef> refs =
+ (List<WSDataRef>) actionResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
WSDataRef wsDataRef = (WSDataRef)refs.get(0);
String xpath = wsDataRef.getXpath();
@@ -164,6 +165,7 @@ public class TestWSSecuritySignaturePart
/**
* Test signing of a header through a STR Dereference Transform
*/
+ @SuppressWarnings("unchecked")
public void testSOAPHeaderSTRTransform() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
@@ -182,7 +184,7 @@ public class TestWSSecuritySignaturePart
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart("STRTransform", "", "Element");
parts.add(encP);
@@ -203,7 +205,7 @@ public class TestWSSecuritySignaturePart
LOG.debug(outputString);
}
- List results = verify(signedDoc);
+ List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult stUnsignedActionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.ST_UNSIGNED);
SAMLAssertion receivedAssertion =
@@ -214,8 +216,8 @@ public class TestWSSecuritySignaturePart
WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
assertTrue(signActionResult != null);
assertFalse(signActionResult.isEmpty());
- final java.util.List refs =
- (java.util.List) signActionResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
+ final List<WSDataRef> refs =
+ (List<WSDataRef>) signActionResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS);
WSDataRef wsDataRef = (WSDataRef)refs.get(0);
String xpath = wsDataRef.getXpath();
@@ -235,7 +237,7 @@ public class TestWSSecuritySignaturePart
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart(
"foobar2",
@@ -265,7 +267,7 @@ public class TestWSSecuritySignaturePart
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart(
"foobar",
@@ -297,7 +299,7 @@ public class TestWSSecuritySignaturePart
WSSecHeader secHeader = new WSSecHeader();
secHeader.insertSecurityHeader(doc);
- List parts = new Vector();
+ List<WSEncryptionPart> parts = new Vector<WSEncryptionPart>();
WSEncryptionPart encP =
new WSEncryptionPart(
soapConstants.getBodyQName().getLocalPart(), // define the body
@@ -320,7 +322,7 @@ public class TestWSSecuritySignaturePart
LOG.debug(outputString);
}
- List results = verify(signedDoc);
+ List<WSSecurityEngineResult> results = verify(signedDoc);
QName fooName = new QName("urn:foo.bar", "foobar");
QName bodyName = new QName(soapConstants.getEnvelopeURI(), "Body");
@@ -367,8 +369,9 @@ public class TestWSSecuritySignaturePart
* @param doc
* @throws Exception Thrown when there is a problem in verification
*/
- private List verify(Document doc) throws Exception {
- List results = secEngine.processSecurityHeader(doc, null, this, crypto);
+ private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
+ List<WSSecurityEngineResult> results =
+ secEngine.processSecurityHeader(doc, null, this, crypto);
if (LOG.isDebugEnabled()) {
LOG.debug("Verfied and decrypted message:");
String outputString =
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityTimestamp.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityTimestamp.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityTimestamp.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityTimestamp.java Fri Nov 12 17:32:10 2010
@@ -100,7 +100,7 @@ public class TestWSSecurityTimestamp ext
//
// Do some processing
//
- List wsResult = verify(createdDoc, WSSConfig.getNewInstance());
+ List<WSSecurityEngineResult> wsResult = verify(createdDoc, WSSConfig.getNewInstance());
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(wsResult, WSConstants.TS);
assertTrue(actionResult != null);
@@ -133,7 +133,7 @@ public class TestWSSecurityTimestamp ext
//
// Do some processing
//
- List wsResult = verify(createdDoc, WSSConfig.getNewInstance());
+ List<WSSecurityEngineResult> wsResult = verify(createdDoc, WSSConfig.getNewInstance());
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(wsResult, WSConstants.TS);
assertTrue(actionResult != null);
@@ -212,7 +212,9 @@ public class TestWSSecurityTimestamp ext
* @param wssConfig
* @throws java.lang.Exception Thrown when there is a problem in verification
*/
- private List verify(Document doc, WSSConfig wssConfig) throws Exception {
+ private List<WSSecurityEngineResult> verify(
+ Document doc, WSSConfig wssConfig
+ ) throws Exception {
secEngine.setWssConfig(wssConfig);
return secEngine.processSecurityHeader(doc, null, null, null);
}
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityUTDK.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityUTDK.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityUTDK.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityUTDK.java Fri Nov 12 17:32:10 2010
@@ -378,7 +378,7 @@ public class TestWSSecurityUTDK extends
LOG.debug(outputString);
}
- List results = verify(signedDoc);
+ List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
java.security.Principal principal =
@@ -429,7 +429,7 @@ public class TestWSSecurityUTDK extends
boolean passwordsAreEnabledOrig = WSSecurityEngine.getInstance().getWssConfig().getPasswordsAreEncoded();
try {
WSSecurityEngine.getInstance().getWssConfig().setPasswordsAreEncoded(true);
- List results = verify(signedDoc);
+ List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.SIGN);
java.security.Principal principal =
@@ -537,7 +537,7 @@ public class TestWSSecurityUTDK extends
* @param env soap envelope
* @throws java.lang.Exception Thrown when there is a problem in verification
*/
- private List verify(Document doc) throws Exception {
+ private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
return secEngine.processSecurityHeader(doc, null, this, crypto);
}
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityUTSignature.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityUTSignature.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityUTSignature.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityUTSignature.java Fri Nov 12 17:32:10 2010
@@ -127,7 +127,7 @@ public class TestWSSecurityUTSignature e
LOG.debug(outputString);
}
- List results = verify(signedDoc);
+ List<WSSecurityEngineResult> results = verify(signedDoc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.UT_SIGN);
java.security.Principal principal =
@@ -183,13 +183,13 @@ public class TestWSSecurityUTSignature e
final WSSConfig cfg = WSSConfig.getNewInstance();
RequestData reqData = new RequestData();
reqData.setWssConfig(cfg);
- java.util.Map messageContext = new java.util.TreeMap();
+ java.util.Map<String, Object> messageContext = new java.util.TreeMap<String, Object>();
messageContext.put(WSHandlerConstants.PW_CALLBACK_REF, this);
messageContext.put(WSHandlerConstants.USE_DERIVED_KEY, "true");
reqData.setMsgContext(messageContext);
reqData.setUsername("bob");
- final java.util.Vector actions = new java.util.Vector();
+ final java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.UT_SIGN));
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
@@ -212,7 +212,7 @@ public class TestWSSecurityUTSignature e
LOG.debug(outputString);
}
- List results = verify(doc);
+ List<WSSecurityEngineResult> results = verify(doc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.UT_SIGN);
java.security.Principal principal =
@@ -228,14 +228,14 @@ public class TestWSSecurityUTSignature e
final WSSConfig cfg = WSSConfig.getNewInstance();
RequestData reqData = new RequestData();
reqData.setWssConfig(cfg);
- java.util.Map messageContext = new java.util.TreeMap();
+ java.util.Map<String, Object> messageContext = new java.util.TreeMap<String, Object>();
messageContext.put(WSHandlerConstants.PW_CALLBACK_REF, this);
messageContext.put(WSHandlerConstants.USE_DERIVED_KEY, "true");
messageContext.put(WSHandlerConstants.DERIVED_KEY_ITERATIONS, "1234");
reqData.setMsgContext(messageContext);
reqData.setUsername("bob");
- final java.util.Vector actions = new java.util.Vector();
+ final java.util.List<Integer> actions = new java.util.Vector<Integer>();
actions.add(new Integer(WSConstants.UT_SIGN));
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
@@ -259,7 +259,7 @@ public class TestWSSecurityUTSignature e
LOG.debug(outputString);
}
- List results = verify(doc);
+ List<WSSecurityEngineResult> results = verify(doc);
WSSecurityEngineResult actionResult =
WSSecurityUtil.fetchActionResult(results, WSConstants.UT_SIGN);
java.security.Principal principal =
@@ -273,7 +273,7 @@ public class TestWSSecurityUTSignature e
* @param env soap envelope
* @throws java.lang.Exception Thrown when there is a problem in verification
*/
- private List verify(Document doc) throws Exception {
+ private List<WSSecurityEngineResult> verify(Document doc) throws Exception {
return secEngine.processSecurityHeader(doc, null, this, crypto);
}
Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityUserProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityUserProcessor.java?rev=1034484&r1=1034483&r2=1034484&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityUserProcessor.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityUserProcessor.java Fri Nov 12 17:32:10 2010
@@ -27,6 +27,7 @@ import org.apache.commons.logging.LogFac
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
+import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.components.crypto.CryptoFactory;
@@ -116,11 +117,10 @@ public class TestWSSecurityUserProcessor
);
final WSSecurityEngine engine = new WSSecurityEngine();
engine.setWssConfig(cfg);
- final List results =
+ final List<WSSecurityEngineResult> results =
engine.processSecurityHeader(doc, null, null, crypto);
boolean found = false;
- for (final java.util.Iterator pos = results.iterator(); pos.hasNext(); ) {
- final java.util.Map result = (java.util.Map) pos.next();
+ for (WSSecurityEngineResult result : results) {
Object obj = result.get("foo");
if (obj != null) {
if (obj.getClass().getName().equals(p)) {
@@ -163,11 +163,10 @@ public class TestWSSecurityUserProcessor
);
final WSSecurityEngine engine = new WSSecurityEngine();
engine.setWssConfig(cfg);
- final List results =
+ final List<WSSecurityEngineResult> results =
engine.processSecurityHeader(doc, null, null, crypto);
boolean found = false;
- for (final java.util.Iterator pos = results.iterator(); pos.hasNext(); ) {
- final java.util.Map result = (java.util.Map) pos.next();
+ for (WSSecurityEngineResult result : results) {
Object obj = result.get("foo");
if (obj != null) {
if (obj.getClass().getName().equals(wssec.MyProcessor.class.getName())) {
@@ -191,7 +190,7 @@ public class TestWSSecurityUserProcessor
final RequestData reqData = new RequestData();
reqData.setWssConfig(cfg);
- final List actions = new Vector();
+ final List<Integer> actions = new Vector<Integer>();
actions.add(new Integer(action));
final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
MyHandler handler = new MyHandler();
@@ -220,7 +219,7 @@ public class TestWSSecurityUserProcessor
final RequestData reqData = new RequestData();
reqData.setWssConfig(cfg);
- final List actions = new Vector();
+ final List<Integer> actions = new Vector<Integer>();
actions.add(new Integer(action));
final Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
MyHandler handler = new MyHandler();
@@ -248,7 +247,7 @@ public class TestWSSecurityUserProcessor
String actionString =
WSHandlerConstants.TIMESTAMP + " " + new Integer(customAction).toString();
- List actionList = new Vector();
+ List<Integer> actionList = new Vector<Integer>();
//
// This parsing will fail as it doesn't know what the custom action is
//
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ws.apache.org
For additional commands, e-mail: dev-help@ws.apache.org