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 2018/10/22 11:28:25 UTC
svn commit: r1844545 - in /webservices/wss4j/trunk:
bindings/src/main/java/org/apache/wss4j/binding/wss10/
performance/src/test/java/org/apache/wss4j/performance/
ws-security-common/src/main/java/org/apache/wss4j/common/crypto/
ws-security-stax/src/mai...
Author: coheigea
Date: Mon Oct 22 11:28:25 2018
New Revision: 1844545
URL: http://svn.apache.org/viewvc?rev=1844545&view=rev
Log:
Removing some redundant type declarations
Modified:
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/BinarySecurityTokenType.java
webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/PerformanceMemoryTest.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/BinarySecurityTokenType.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/BinarySecurityTokenType.java?rev=1844545&r1=1844544&r2=1844545&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/BinarySecurityTokenType.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wss10/BinarySecurityTokenType.java Mon Oct 22 11:28:25 2018
@@ -120,7 +120,7 @@ public class BinarySecurityTokenType {
*/
public List<Serializable> getContent() {
if (content == null) {
- content = new ArrayList<Serializable>();
+ content = new ArrayList<>();
}
return this.content;
}
Modified: webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/PerformanceMemoryTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/PerformanceMemoryTest.java?rev=1844545&r1=1844544&r2=1844545&view=diff
==============================================================================
--- webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/PerformanceMemoryTest.java (original)
+++ webservices/wss4j/trunk/performance/src/test/java/org/apache/wss4j/performance/PerformanceMemoryTest.java Mon Oct 22 11:28:25 2018
@@ -429,7 +429,7 @@ public class PerformanceMemoryTest exten
private FileWriter fileWriter;
private long memoryDiff;
- private List<Integer> memory = new LinkedList<Integer>();
+ private List<Integer> memory = new LinkedList<>();
MemorySamplerThread(ThreadStopper threadStopper, FileWriter fileWriter, long memoryDiff) {
this.threadStopper = threadStopper;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java?rev=1844545&r1=1844544&r2=1844545&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/ThreadLocalSecurityProvider.java Mon Oct 22 11:28:25 2018
@@ -32,7 +32,7 @@ public final class ThreadLocalSecurityPr
private static final long serialVersionUID = 3556396671069994931L;
private static final String NAME = "TLSP";
- private static final ThreadLocal<Provider> PROVIDER = new ThreadLocal<Provider>();
+ private static final ThreadLocal<Provider> PROVIDER = new ThreadLocal<>();
private static boolean installed = false;
public static synchronized void install() {
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java?rev=1844545&r1=1844544&r2=1844545&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java Mon Oct 22 11:28:25 2018
@@ -56,7 +56,7 @@ public class InboundWSSecurityContextImp
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(InboundWSSecurityContextImpl.class);
- private final Deque<SecurityEvent> securityEventQueue = new ArrayDeque<SecurityEvent>();
+ private final Deque<SecurityEvent> securityEventQueue = new ArrayDeque<>();
private boolean operationSecurityEventOccured = false;
private boolean messageEncryptionTokenOccured = false;
private boolean allowRSA15KeyTransportAlgorithm = false;
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java?rev=1844545&r1=1844544&r2=1844545&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java Mon Oct 22 11:28:25 2018
@@ -53,7 +53,7 @@ public class SecurityHeaderInputProcesso
protected static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SecurityHeaderInputProcessor.class);
- private final ArrayDeque<XMLSecEvent> xmlSecEventList = new ArrayDeque<XMLSecEvent>();
+ private final ArrayDeque<XMLSecEvent> xmlSecEventList = new ArrayDeque<>();
private int startIndexForProcessor;
public SecurityHeaderInputProcessor(WSSSecurityProperties securityProperties) {
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java?rev=1844545&r1=1844544&r2=1844545&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java Mon Oct 22 11:28:25 2018
@@ -108,7 +108,7 @@ public class SecurityTokenReferenceInput
private QName startElementName;
private int startElementLevel;
- private final ArrayDeque<XMLSecEvent> xmlSecEventList = new ArrayDeque<XMLSecEvent>();
+ private final ArrayDeque<XMLSecEvent> xmlSecEventList = new ArrayDeque<>();
InternalSecurityTokenReferenceInputProcessor(String securityTokenReferenceId, QName attribute,
String attributeValue, WSSSecurityProperties securityProperties) {
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java?rev=1844545&r1=1844544&r2=1844545&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java Mon Oct 22 11:28:25 2018
@@ -171,7 +171,7 @@ public class SecurityHeaderReorderProces
}
Map<SecurityHeaderOrder, Deque<XMLSecEvent>> map = actionEventMap.get(securityHeaderOrder.getAction());
- currentDeque = new ArrayDeque<XMLSecEvent>();
+ currentDeque = new ArrayDeque<>();
map.put(securityHeaderOrder, currentDeque);
securityHeaderIndex++;
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java?rev=1844545&r1=1844544&r2=1844545&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java Mon Oct 22 11:28:25 2018
@@ -105,7 +105,7 @@ public class InboundWSSecurityContextImp
public List<SecurityEvent> generateTransportBindingSecurityEvents() throws Exception {
- final List<SecurityEvent> securityEventList = new LinkedList<SecurityEvent>();
+ final List<SecurityEvent> securityEventList = new LinkedList<>();
SecurityEventListener securityEventListener = new SecurityEventListener() {
@Override
@@ -127,7 +127,7 @@ public class InboundWSSecurityContextImp
TimestampSecurityEvent timestampSecurityEvent = new TimestampSecurityEvent();
inboundWSSecurityContext.registerSecurityEvent(timestampSecurityEvent);
- List<QName> timestampPath = new LinkedList<QName>();
+ List<QName> timestampPath = new LinkedList<>();
timestampPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
timestampPath.add(WSSConstants.TAG_WSU_TIMESTAMP);
@@ -135,7 +135,7 @@ public class InboundWSSecurityContextImp
timestampRequiredElementSecurityEvent.setElementPath(timestampPath);
inboundWSSecurityContext.registerSecurityEvent(timestampRequiredElementSecurityEvent);
- List<QName> usernameTokenPath = new LinkedList<QName>();
+ List<QName> usernameTokenPath = new LinkedList<>();
usernameTokenPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
usernameTokenPath.add(WSSConstants.TAG_WSSE_USERNAME_TOKEN);
@@ -156,7 +156,7 @@ public class InboundWSSecurityContextImp
SignatureConfirmationSecurityEvent signatureConfirmationSecurityEvent = new SignatureConfirmationSecurityEvent();
inboundWSSecurityContext.registerSecurityEvent(signatureConfirmationSecurityEvent);
- List<QName> scPath = new LinkedList<QName>();
+ List<QName> scPath = new LinkedList<>();
scPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
scPath.add(WSSConstants.TAG_WSSE11_SIG_CONF);
@@ -164,7 +164,7 @@ public class InboundWSSecurityContextImp
scRequiredElementSecurityEvent.setElementPath(scPath);
inboundWSSecurityContext.registerSecurityEvent(scRequiredElementSecurityEvent);
- List<QName> bstPath = new LinkedList<QName>();
+ List<QName> bstPath = new LinkedList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
bstPath.add(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
@@ -270,7 +270,7 @@ public class InboundWSSecurityContextImp
}
public List<SecurityEvent> generateAsymmetricBindingSecurityEvents() throws Exception {
- final List<SecurityEvent> securityEventList = new LinkedList<SecurityEvent>();
+ final List<SecurityEvent> securityEventList = new LinkedList<>();
SecurityEventListener securityEventListener = new SecurityEventListener() {
@Override
@@ -285,7 +285,7 @@ public class InboundWSSecurityContextImp
TimestampSecurityEvent timestampSecurityEvent = new TimestampSecurityEvent();
inboundWSSecurityContext.registerSecurityEvent(timestampSecurityEvent);
- List<QName> timestampPath = new LinkedList<QName>();
+ List<QName> timestampPath = new LinkedList<>();
timestampPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
timestampPath.add(WSSConstants.TAG_WSU_TIMESTAMP);
@@ -296,7 +296,7 @@ public class InboundWSSecurityContextImp
SignatureConfirmationSecurityEvent signatureConfirmationSecurityEvent = new SignatureConfirmationSecurityEvent();
inboundWSSecurityContext.registerSecurityEvent(signatureConfirmationSecurityEvent);
- List<QName> scPath = new LinkedList<QName>();
+ List<QName> scPath = new LinkedList<>();
scPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
scPath.add(WSSConstants.TAG_WSSE11_SIG_CONF);
@@ -304,7 +304,7 @@ public class InboundWSSecurityContextImp
scRequiredElementSecurityEvent.setElementPath(scPath);
inboundWSSecurityContext.registerSecurityEvent(scRequiredElementSecurityEvent);
- List<QName> bstPath = new LinkedList<QName>();
+ List<QName> bstPath = new LinkedList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
bstPath.add(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
@@ -322,7 +322,7 @@ public class InboundWSSecurityContextImp
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
- List<QName> signaturePath = new LinkedList<QName>();
+ List<QName> signaturePath = new LinkedList<>();
signaturePath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
signaturePath.add(WSSConstants.TAG_dsig_Signature);
@@ -330,7 +330,7 @@ public class InboundWSSecurityContextImp
signatureEncryptedElementSecurityEvent.setElementPath(signaturePath);
inboundWSSecurityContext.registerSecurityEvent(signatureEncryptedElementSecurityEvent);
- List<QName> usernameTokenPath = new LinkedList<QName>();
+ List<QName> usernameTokenPath = new LinkedList<>();
usernameTokenPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
usernameTokenPath.add(WSSConstants.TAG_WSSE_USERNAME_TOKEN);
@@ -441,7 +441,7 @@ public class InboundWSSecurityContextImp
bstElementSecurityEvent.setXmlSecEvent(initiatorTokenXmlEvent);
inboundWSSecurityContext.registerSecurityEvent(bstElementSecurityEvent);
- List<QName> header1Path = new LinkedList<QName>();
+ List<QName> header1Path = new LinkedList<>();
header1Path.addAll(WSSConstants.SOAP_11_HEADER_PATH);
header1Path.add(new QName("x", "Header1", "x"));
@@ -449,7 +449,7 @@ public class InboundWSSecurityContextImp
header1SignedPartSecurityEvent.setElementPath(header1Path);
inboundWSSecurityContext.registerSecurityEvent(header1SignedPartSecurityEvent);
- List<QName> header2Path = new LinkedList<QName>();
+ List<QName> header2Path = new LinkedList<>();
header2Path.addAll(WSSConstants.SOAP_11_HEADER_PATH);
header2Path.add(new QName("x", "Header1", "x"));
@@ -457,7 +457,7 @@ public class InboundWSSecurityContextImp
header2SignedPartSecurityEvent.setElementPath(header2Path);
inboundWSSecurityContext.registerSecurityEvent(header2SignedPartSecurityEvent);
- List<QName> bodyPath = new LinkedList<QName>();
+ List<QName> bodyPath = new LinkedList<>();
bodyPath.addAll(WSSConstants.SOAP_11_BODY_PATH);
SignedPartSecurityEvent bodySignedPartSecurityEvent = new SignedPartSecurityEvent(initiatorToken, true, protectionOrder);
@@ -539,7 +539,7 @@ public class InboundWSSecurityContextImp
}
public List<SecurityEvent> generateSymmetricBindingSecurityEvents() throws Exception {
- final List<SecurityEvent> securityEventList = new LinkedList<SecurityEvent>();
+ final List<SecurityEvent> securityEventList = new LinkedList<>();
SecurityEventListener securityEventListener = new SecurityEventListener() {
@Override
@@ -554,7 +554,7 @@ public class InboundWSSecurityContextImp
TimestampSecurityEvent timestampSecurityEvent = new TimestampSecurityEvent();
inboundWSSecurityContext.registerSecurityEvent(timestampSecurityEvent);
- List<QName> timestampPath = new LinkedList<QName>();
+ List<QName> timestampPath = new LinkedList<>();
timestampPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
timestampPath.add(WSSConstants.TAG_WSU_TIMESTAMP);
@@ -565,7 +565,7 @@ public class InboundWSSecurityContextImp
SignatureConfirmationSecurityEvent signatureConfirmationSecurityEvent = new SignatureConfirmationSecurityEvent();
inboundWSSecurityContext.registerSecurityEvent(signatureConfirmationSecurityEvent);
- List<QName> scPath = new LinkedList<QName>();
+ List<QName> scPath = new LinkedList<>();
scPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
scPath.add(WSSConstants.TAG_WSSE11_SIG_CONF);
@@ -573,7 +573,7 @@ public class InboundWSSecurityContextImp
scRequiredElementSecurityEvent.setElementPath(scPath);
inboundWSSecurityContext.registerSecurityEvent(scRequiredElementSecurityEvent);
- List<QName> samlTokenPath = new LinkedList<QName>();
+ List<QName> samlTokenPath = new LinkedList<>();
samlTokenPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
samlTokenPath.add(WSSConstants.TAG_SAML2_ASSERTION);
@@ -600,7 +600,7 @@ public class InboundWSSecurityContextImp
protectionOrder.add(XMLSecurityConstants.ContentType.ENCRYPTION);
protectionOrder.add(XMLSecurityConstants.ContentType.SIGNATURE);
- List<QName> usernamePath = new LinkedList<QName>();
+ List<QName> usernamePath = new LinkedList<>();
usernamePath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
usernamePath.add(WSSConstants.TAG_WSSE_USERNAME_TOKEN);
@@ -611,7 +611,7 @@ public class InboundWSSecurityContextImp
usernameEncryptedElementSecurityEvent.setXmlSecEvent(usernameTokenXmlEvent);
inboundWSSecurityContext.registerSecurityEvent(usernameEncryptedElementSecurityEvent);
- List<QName> usernameTokenPath = new LinkedList<QName>();
+ List<QName> usernameTokenPath = new LinkedList<>();
usernameTokenPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
usernameTokenPath.add(WSSConstants.TAG_WSSE_USERNAME_TOKEN);
@@ -627,7 +627,7 @@ public class InboundWSSecurityContextImp
usernameTokenSecurityEvent.setSecurityToken(usernameSecurityToken);
inboundWSSecurityContext.registerSecurityEvent(usernameTokenSecurityEvent);
- List<QName> signaturePath = new LinkedList<QName>();
+ List<QName> signaturePath = new LinkedList<>();
signaturePath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
signaturePath.add(WSSConstants.TAG_dsig_Signature);
@@ -656,7 +656,7 @@ public class InboundWSSecurityContextImp
signedUsernameTokenElementSecurityEvent.setXmlSecEvent(usernameTokenXmlEvent);
inboundWSSecurityContext.registerSecurityEvent(signedUsernameTokenElementSecurityEvent);
- List<QName> bstPath = new LinkedList<QName>();
+ List<QName> bstPath = new LinkedList<>();
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
bstPath.add(WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN);
@@ -672,7 +672,7 @@ public class InboundWSSecurityContextImp
samlTokenElementSecurityEvent.setXmlSecEvent(samlTokenXmlEvent);
inboundWSSecurityContext.registerSecurityEvent(samlTokenElementSecurityEvent);
- List<QName> header1Path = new LinkedList<QName>();
+ List<QName> header1Path = new LinkedList<>();
header1Path.addAll(WSSConstants.SOAP_11_HEADER_PATH);
header1Path.add(new QName("x", "Header1", "x"));
@@ -680,7 +680,7 @@ public class InboundWSSecurityContextImp
header1SignedPartSecurityEvent.setElementPath(header1Path);
inboundWSSecurityContext.registerSecurityEvent(header1SignedPartSecurityEvent);
- List<QName> header2Path = new LinkedList<QName>();
+ List<QName> header2Path = new LinkedList<>();
header2Path.addAll(WSSConstants.SOAP_11_HEADER_PATH);
header2Path.add(new QName("x", "Header1", "x"));
@@ -688,7 +688,7 @@ public class InboundWSSecurityContextImp
header2SignedPartSecurityEvent.setElementPath(header2Path);
inboundWSSecurityContext.registerSecurityEvent(header2SignedPartSecurityEvent);
- List<QName> bodyPath = new LinkedList<QName>();
+ List<QName> bodyPath = new LinkedList<>();
bodyPath.addAll(WSSConstants.SOAP_11_BODY_PATH);
SignedPartSecurityEvent bodySignedPartSecurityEvent = new SignedPartSecurityEvent(samlSecurityToken, true, protectionOrder);