Use generics.
diff --git a/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java b/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
index 39426e8..0572cd6 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
@@ -200,12 +200,12 @@
// TODO may contain deifferent types of objects as values, therefore cannot use strongly type maps
// need to figure out a way
- HashMap sigSuppTokMap = null;
- HashMap endSuppTokMap = null;
- HashMap sgndEndSuppTokMap = null;
- HashMap sgndEncSuppTokMap = null;
- HashMap endEncSuppTokMap = null;
- HashMap sgndEndEncSuppTokMap = null;
+ HashMap<Token,Object> sigSuppTokMap = null;
+ HashMap<Token,Object> endSuppTokMap = null;
+ HashMap<Token,Object> sgndEndSuppTokMap = null;
+ HashMap<Token,Object> sgndEncSuppTokMap = null;
+ HashMap<Token,Object> endEncSuppTokMap = null;
+ HashMap<Token,Object> sgndEndEncSuppTokMap = null;
if(this.timestampElement != null){
sigParts.add(RampartUtil.createEncryptionPart(WSConstants.TIMESTAMP_TOKEN_LN,
diff --git a/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java b/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
index d12862c..dd36d21 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
@@ -474,17 +474,13 @@
}
- protected List<byte[]> doEndorsedSignatures(RampartMessageData rmd, HashMap tokenMap) throws RampartException {
-
- Set tokenSet = tokenMap.keySet();
+ protected List<byte[]> doEndorsedSignatures(RampartMessageData rmd, HashMap<Token,Object> tokenMap) throws RampartException {
List<byte[]> sigValues = new ArrayList<byte[]>();
- for (Object aTokenSet : tokenSet) {
-
- Token token = (Token) aTokenSet;
-
- Object tempTok = tokenMap.get(token);
+ for (Map.Entry<Token,Object> entry : tokenMap.entrySet()) {
+ Token token = entry.getKey();
+ Object tempTok = entry.getValue();
// Migrating to a list
List<WSEncryptionPart> sigParts = new ArrayList<WSEncryptionPart>();
