You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2017/03/09 10:16:18 UTC
svn commit: r1786126 - in /webservices/wss4j/trunk:
bindings/src/main/java/org/apache/wss4j/binding/wss10/
bindings/src/main/java/org/apache/wss4j/binding/wssc13/
bindings/src/main/java/org/apache/wss4j/binding/wssc200502/
bindings/src/main/java/org/ap...
Author: coheigea
Date: Thu Mar 9 10:16:18 2017
New Revision: 1786126
URL: http://svn.apache.org/viewvc?rev=1786126&view=rev
Log:
Removing HashMap parameters
Modified:
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/AttributedString.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/EmbeddedType.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/ReferenceType.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/SecurityHeaderType.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/SecurityTokenReferenceType.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/TransformationParametersType.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/UsernameTokenType.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc13/SecurityContextTokenType.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/SecurityContextTokenType.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/AttributedDateTime.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/AttributedURI.java
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/TimestampType.java
webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentCallbackHandler.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/SecretKeyCallbackHandler.java
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/AttributedString.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/AttributedString.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/AttributedString.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/AttributedString.java Thu Mar 9 10:16:18 2017
@@ -80,7 +80,7 @@ public class AttributedString {
@XmlSchemaType(name = "ID")
private String id;
@XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ private Map<QName, String> otherAttributes = new HashMap<>();
/**
* Gets the value of the value property.
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/EmbeddedType.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/EmbeddedType.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/EmbeddedType.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/EmbeddedType.java Thu Mar 9 10:16:18 2017
@@ -76,7 +76,7 @@ public class EmbeddedType {
@XmlSchemaType(name = "anyURI")
private String valueType;
@XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ private Map<QName, String> otherAttributes = new HashMap<>();
/**
* Gets the value of the any property.
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/ReferenceType.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/ReferenceType.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/ReferenceType.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/ReferenceType.java Thu Mar 9 10:16:18 2017
@@ -69,7 +69,7 @@ public class ReferenceType {
@XmlSchemaType(name = "anyURI")
private String valueType;
@XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ private Map<QName, String> otherAttributes = new HashMap<>();
/**
* Gets the value of the uri property.
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/SecurityHeaderType.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/SecurityHeaderType.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/SecurityHeaderType.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/SecurityHeaderType.java Thu Mar 9 10:16:18 2017
@@ -70,7 +70,7 @@ public class SecurityHeaderType {
@XmlAnyElement(lax = true)
private List<Object> any;
@XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ private Map<QName, String> otherAttributes = new HashMap<>();
/**
* Gets the value of the any property.
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/SecurityTokenReferenceType.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/SecurityTokenReferenceType.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/SecurityTokenReferenceType.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/SecurityTokenReferenceType.java Thu Mar 9 10:16:18 2017
@@ -84,7 +84,7 @@ public class SecurityTokenReferenceType
@XmlAttribute(name = "Usage", namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd")
private List<String> usage;
@XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ private Map<QName, String> otherAttributes = new HashMap<>();
/**
* Gets the value of the any property.
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/TransformationParametersType.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/TransformationParametersType.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/TransformationParametersType.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/TransformationParametersType.java Thu Mar 9 10:16:18 2017
@@ -70,7 +70,7 @@ public class TransformationParametersTyp
@XmlAnyElement(lax = true)
private List<Object> any;
@XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ private Map<QName, String> otherAttributes = new HashMap<>();
/**
* Gets the value of the any property.
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/UsernameTokenType.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/UsernameTokenType.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/UsernameTokenType.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/UsernameTokenType.java Thu Mar 9 10:16:18 2017
@@ -86,7 +86,7 @@ public class UsernameTokenType {
@XmlSchemaType(name = "ID")
private String id;
@XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ private Map<QName, String> otherAttributes = new HashMap<>();
/**
* Gets the value of the username property.
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc13/SecurityContextTokenType.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc13/SecurityContextTokenType.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc13/SecurityContextTokenType.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc13/SecurityContextTokenType.java Thu Mar 9 10:16:18 2017
@@ -89,7 +89,7 @@ public class SecurityContextTokenType
@XmlSchemaType(name = "ID")
private String id;
@XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ private Map<QName, String> otherAttributes = new HashMap<>();
/**
* Gets the value of the any property.
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/SecurityContextTokenType.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/SecurityContextTokenType.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/SecurityContextTokenType.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/SecurityContextTokenType.java Thu Mar 9 10:16:18 2017
@@ -98,7 +98,7 @@ public class SecurityContextTokenType
@XmlSchemaType(name = "ID")
private String id;
@XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ private Map<QName, String> otherAttributes = new HashMap<>();
/**
* Gets the value of the any property.
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/AttributedDateTime.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/AttributedDateTime.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/AttributedDateTime.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/AttributedDateTime.java Thu Mar 9 10:16:18 2017
@@ -79,7 +79,7 @@ public class AttributedDateTime
@XmlSchemaType(name = "ID")
private String id;
@XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ private Map<QName, String> otherAttributes = new HashMap<>();
/**
* Gets the value of the value property.
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/AttributedURI.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/AttributedURI.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/AttributedURI.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/AttributedURI.java Thu Mar 9 10:16:18 2017
@@ -78,7 +78,7 @@ public class AttributedURI {
@XmlSchemaType(name = "ID")
private String id;
@XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ private Map<QName, String> otherAttributes = new HashMap<>();
/**
* Gets the value of the value property.
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/TimestampType.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/TimestampType.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/TimestampType.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wsu10/TimestampType.java Thu Mar 9 10:16:18 2017
@@ -94,7 +94,7 @@ public class TimestampType {
@XmlSchemaType(name = "ID")
private String id;
@XmlAnyAttribute
- private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+ private Map<QName, String> otherAttributes = new HashMap<>();
/**
* Gets the value of the created property.
Modified: webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java (original)
+++ webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/AbstractTestBase.java Thu Mar 9 10:16:18 2017
@@ -294,7 +294,7 @@ public abstract class AbstractTestBase e
}
protected Map<String, Object> getMessageContext(InputStream inputStream) {
- Map<String, Object> context = new HashMap<String, Object>();
+ Map<String, Object> context = new HashMap<>();
try {
context.put(SECURED_DOCUMENT, SOAPUtil.toSOAPPart(inputStream));
} catch (Exception e) {
@@ -304,7 +304,7 @@ public abstract class AbstractTestBase e
}
private Map<String, Object> getMessageContext(Document document) {
- Map<String, Object> context = new HashMap<String, Object>();
+ Map<String, Object> context = new HashMap<>();
context.put(SECURED_DOCUMENT, document);
return context;
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java Thu Mar 9 10:16:18 2017
@@ -40,7 +40,7 @@ public class X509Token extends AbstractT
WssX509Pkcs7Token11,
WssX509PkiPathV1Token11;
- private static final Map<String, TokenType> LOOKUP = new HashMap<String, TokenType>();
+ private static final Map<String, TokenType> LOOKUP = new HashMap<>();
static {
for (TokenType u : EnumSet.allOf(TokenType.class)) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java Thu Mar 9 10:16:18 2017
@@ -276,7 +276,7 @@ public final class WSSConfig {
* The known actions are initialized from a set of defaults,
* but the list may be modified via the setAction operations.
*/
- private final Map<Integer, Object> actionMap = new HashMap<Integer, Object>(DEFAULT_ACTIONS);
+ private final Map<Integer, Object> actionMap = new HashMap<>(DEFAULT_ACTIONS);
/**
* The known processors. This map is of the form <QName, Class<?>> or
@@ -284,7 +284,7 @@ public final class WSSConfig {
* The known processors are initialized from a set of defaults,
* but the list may be modified via the setProcessor operations.
*/
- private final Map<QName, Object> processorMap = new HashMap<QName, Object>(DEFAULT_PROCESSORS);
+ private final Map<QName, Object> processorMap = new HashMap<>(DEFAULT_PROCESSORS);
/**
* The known validators. This map is of the form <QName, Class<?>> or
@@ -292,7 +292,7 @@ public final class WSSConfig {
* The known validators are initialized from a set of defaults,
* but the list may be modified via the setValidator operations.
*/
- private final Map<QName, Object> validatorMap = new HashMap<QName, Object>(DEFAULT_VALIDATORS);
+ private final Map<QName, Object> validatorMap = new HashMap<>(DEFAULT_VALIDATORS);
static {
try {
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AbstractTestBase.java Thu Mar 9 10:16:18 2017
@@ -304,7 +304,7 @@ public abstract class AbstractTestBase e
}
protected Map<String, Object> getMessageContext(InputStream inputStream) {
- Map<String, Object> context = new HashMap<String, Object>();
+ Map<String, Object> context = new HashMap<>();
try {
context.put(SECURED_DOCUMENT, SOAPUtil.toSOAPPart(inputStream));
} catch (Exception e) {
@@ -314,7 +314,7 @@ public abstract class AbstractTestBase e
}
private Map<String, Object> getMessageContext(Document document) {
- Map<String, Object> context = new HashMap<String, Object>();
+ Map<String, Object> context = new HashMap<>();
context.put(SECURED_DOCUMENT, document);
return context;
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentCallbackHandler.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentCallbackHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentCallbackHandler.java Thu Mar 9 10:16:18 2017
@@ -40,7 +40,7 @@ import java.util.Map;
public class AttachmentCallbackHandler implements CallbackHandler {
private final List<Attachment> originalRequestAttachments;
- private Map<String, Attachment> attachmentMap = new HashMap<String, Attachment>();
+ private Map<String, Attachment> attachmentMap = new HashMap<>();
private List<Attachment> responseAttachments = new ArrayList<>();
public AttachmentCallbackHandler(List<Attachment> attachments) {
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java Thu Mar 9 10:16:18 2017
@@ -75,7 +75,7 @@ public class AttachmentTest extends Abst
}
protected Map<String, String> getHeaders(String attachmentId) {
- Map<String, String> headers = new HashMap<String, String>();
+ Map<String, String> headers = new HashMap<>();
headers.put(AttachmentUtils.MIME_HEADER_CONTENT_DESCRIPTION, "Attachment");
headers.put(AttachmentUtils.MIME_HEADER_CONTENT_DISPOSITION, "attachment; filename=\"fname.ext\"");
headers.put(AttachmentUtils.MIME_HEADER_CONTENT_ID, "<attachment=" + attachmentId + ">");
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java Thu Mar 9 10:16:18 2017
@@ -39,7 +39,7 @@ public class ConfigurationConverterTest
@Test
public void testUsernameTokenConfiguration() throws Exception {
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
config.put(ConfigurationConstants.USER, "testuser");
config.put(ConfigurationConstants.PW_CALLBACK_CLASS, "org.apache.wss4j.stax.test.CallbackHandlerImpl");
@@ -62,7 +62,7 @@ public class ConfigurationConverterTest
@Test
public void testOutboundSignatureConfiguration() throws Exception {
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
config.put(ConfigurationConstants.USER, "transmitter");
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
@@ -97,7 +97,7 @@ public class ConfigurationConverterTest
@Test
public void testInboundSignatureConfiguration() throws Exception {
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
config.put(ConfigurationConstants.ADD_INCLUSIVE_PREFIXES, "false");
@@ -119,7 +119,7 @@ public class ConfigurationConverterTest
@Test
public void testOutboundEncryptionConfiguration() throws Exception {
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
config.put(ConfigurationConstants.USER, "transmitter");
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
@@ -152,7 +152,7 @@ public class ConfigurationConverterTest
@Test
public void testInboundEncryptionConfiguration() throws Exception {
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
config.put(ConfigurationConstants.DEC_PROP_FILE, "receiver-crypto.properties");
@@ -170,7 +170,7 @@ public class ConfigurationConverterTest
@Test
public void testSAMLConfiguration() throws Exception {
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
config.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAMLCallbackHandlerImpl());
@@ -185,7 +185,7 @@ public class ConfigurationConverterTest
@Test
public void testTimestampConfiguration() throws Exception {
// Outbound
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
config.put(ConfigurationConstants.TTL_TIMESTAMP, "180");
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java Thu Mar 9 10:16:18 2017
@@ -2372,7 +2372,7 @@ public class EncDecryptionTest extends A
ByteArrayOutputStream baos;
{
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
config.put(ConfigurationConstants.ENCRYPTION_USER, "receiver");
config.put(ConfigurationConstants.ENC_PROP_FILE, "transmitter-crypto.properties");
@@ -2439,7 +2439,7 @@ public class EncDecryptionTest extends A
}
//test streaming decryption
{
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
config.put(ConfigurationConstants.DEC_PROP_FILE, "receiver-crypto.properties");
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureTest.java Thu Mar 9 10:16:18 2017
@@ -1589,7 +1589,7 @@ public class SignatureTest extends Abstr
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
config.put(ConfigurationConstants.SIGNATURE_USER, "transmitter");
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
@@ -1646,7 +1646,7 @@ public class SignatureTest extends Abstr
//done signature; now test sig-verification:
{
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
config.put(ConfigurationConstants.SIG_VER_PROP_FILE, "transmitter-crypto.properties");
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java Thu Mar 9 10:16:18 2017
@@ -667,7 +667,7 @@ public class TimestampTest extends Abstr
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
@@ -724,7 +724,7 @@ public class TimestampTest extends Abstr
//done timestamp; now test timestamp-verification:
{
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
InboundWSSec wsSecIn = WSSec.getInboundWSSec(securityProperties);
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java Thu Mar 9 10:16:18 2017
@@ -762,7 +762,7 @@ public class UsernameTokenTest extends A
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
config.put(ConfigurationConstants.USER, "transmitter");
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
@@ -813,7 +813,7 @@ public class UsernameTokenTest extends A
//done UsernameToken; now verification:
{
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
WSSSecurityProperties securityProperties = ConfigurationConverter.convert(config);
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java Thu Mar 9 10:16:18 2017
@@ -797,7 +797,7 @@ public class SAMLTokenTest extends Abstr
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
SAMLCallbackHandlerImpl callbackHandler = new SAMLCallbackHandlerImpl();
@@ -852,7 +852,7 @@ public class SAMLTokenTest extends Abstr
//done signature; now test sig-verification:
{
- Map<String, Object> config = new HashMap<String, Object>();
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
config.put(ConfigurationConstants.SIG_VER_PROP_FILE, "receiver-crypto.properties");
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/SecretKeyCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/SecretKeyCallbackHandler.java?rev=1786126&r1=1786125&r2=1786126&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/SecretKeyCallbackHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/utils/SecretKeyCallbackHandler.java Thu Mar 9 10:16:18 2017
@@ -37,7 +37,7 @@ import java.util.Map;
*/
public class SecretKeyCallbackHandler implements CallbackHandler {
- private Map<String, byte[]> secrets = new HashMap<String, byte[]>();
+ private Map<String, byte[]> secrets = new HashMap<>();
private byte[] outboundSecret;
@Override