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/26 10:13:03 UTC
svn commit: r1844886 - in /webservices/wss4j/trunk:
ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/
ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/
ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/
Author: coheigea
Date: Fri Oct 26 10:13:03 2018
New Revision: 1844886
URL: http://svn.apache.org/viewvc?rev=1844886&view=rev
Log:
More diamond operator cleanup
Modified:
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.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/saml/SamlConditionsTest.java
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java?rev=1844886&r1=1844885&r2=1844886&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/ResultsOrderTest.java Fri Oct 26 10:13:03 2018
@@ -106,7 +106,7 @@ public class ResultsOrderTest extends or
CustomHandler handler = new CustomHandler();
java.util.List<WSSecurityEngineResult> results =
- new java.util.ArrayList<WSSecurityEngineResult>();
+ new java.util.ArrayList<>();
results.add(
new WSSecurityEngineResult(WSConstants.TS)
);
@@ -138,7 +138,7 @@ public class ResultsOrderTest extends or
CustomHandler handler = new CustomHandler();
java.util.List<WSSecurityEngineResult> results =
- new java.util.ArrayList<WSSecurityEngineResult>();
+ new java.util.ArrayList<>();
results.add(
new WSSecurityEngineResult(WSConstants.TS)
);
@@ -169,7 +169,7 @@ public class ResultsOrderTest extends or
CustomHandler handler = new CustomHandler();
java.util.List<WSSecurityEngineResult> results =
- new java.util.ArrayList<WSSecurityEngineResult>();
+ new java.util.ArrayList<>();
results.add(
new WSSecurityEngineResult(WSConstants.UT)
);
@@ -197,7 +197,7 @@ public class ResultsOrderTest extends or
CustomHandler handler = new CustomHandler();
java.util.List<WSSecurityEngineResult> results =
- new java.util.ArrayList<WSSecurityEngineResult>();
+ new java.util.ArrayList<>();
results.add(
new WSSecurityEngineResult(WSConstants.UT)
);
@@ -227,7 +227,7 @@ public class ResultsOrderTest extends or
CustomHandler handler = new CustomHandler();
java.util.List<WSSecurityEngineResult> results =
- new java.util.ArrayList<WSSecurityEngineResult>();
+ new java.util.ArrayList<>();
java.util.List<Integer> actions = new java.util.ArrayList<>();
actions.add(WSConstants.TS);
@@ -244,7 +244,7 @@ public class ResultsOrderTest extends or
CustomHandler handler = new CustomHandler();
java.util.List<WSSecurityEngineResult> results =
- new java.util.ArrayList<WSSecurityEngineResult>();
+ new java.util.ArrayList<>();
results.add(
new WSSecurityEngineResult(WSConstants.TS)
);
@@ -263,7 +263,7 @@ public class ResultsOrderTest extends or
CustomHandler handler = new CustomHandler();
java.util.List<WSSecurityEngineResult> results =
- new java.util.ArrayList<WSSecurityEngineResult>();
+ new java.util.ArrayList<>();
results.add(
new WSSecurityEngineResult(WSConstants.ENCR)
);
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=1844886&r1=1844885&r2=1844886&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 Fri Oct 26 10:13:03 2018
@@ -54,7 +54,7 @@ import org.apache.xml.security.stax.impl
public class SecurityHeaderReorderProcessor extends AbstractOutputProcessor {
private final Map<XMLSecurityConstants.Action, Map<SecurityHeaderOrder, Deque<XMLSecEvent>>> actionEventMap =
- new LinkedHashMap<XMLSecurityConstants.Action, Map<SecurityHeaderOrder, Deque<XMLSecEvent>>>();
+ new LinkedHashMap<>();
private int securityHeaderIndex;
private Deque<XMLSecEvent> currentDeque;
Modified: webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java?rev=1844886&r1=1844885&r2=1844886&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SamlConditionsTest.java Fri Oct 26 10:13:03 2018
@@ -650,7 +650,7 @@ public class SamlConditionsTest extends
conditions.setTokenPeriodMinutes(5);
List<AudienceRestrictionBean> audiencesRestrictions =
- new ArrayList<AudienceRestrictionBean>();
+ new ArrayList<>();
AudienceRestrictionBean audienceRestrictionBean = new AudienceRestrictionBean();
audienceRestrictionBean.setAudienceURIs(Collections.singletonList("http://apache.org/one"));
audiencesRestrictions.add(audienceRestrictionBean);
@@ -698,7 +698,7 @@ public class SamlConditionsTest extends
conditions.setTokenPeriodMinutes(5);
List<AudienceRestrictionBean> audiencesRestrictions =
- new ArrayList<AudienceRestrictionBean>();
+ new ArrayList<>();
AudienceRestrictionBean audienceRestrictionBean = new AudienceRestrictionBean();
audienceRestrictionBean.setAudienceURIs(Collections.singletonList("http://apache.org/one"));
audiencesRestrictions.add(audienceRestrictionBean);