You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/10 22:23:48 UTC
svn commit: r1778215 - in
/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder:
AsymmetricBindingBuilder.java BindingBuilder.java
Author: veithen
Date: Tue Jan 10 22:23:48 2017
New Revision: 1778215
URL: http://svn.apache.org/viewvc?rev=1778215&view=rev
Log:
Use generics.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=1778215&r1=1778214&r2=1778215&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java Tue Jan 10 22:23:48 2017
@@ -200,12 +200,12 @@ public class AsymmetricBindingBuilder ex
// 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,
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1778215&r1=1778214&r2=1778215&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java Tue Jan 10 22:23:48 2017
@@ -474,17 +474,13 @@ public abstract class BindingBuilder {
}
- 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>();