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 2015/02/16 12:48:43 UTC
svn commit: r1660079 - in
/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common:
./ cache/ crypto/ ext/ saml/ saml/bean/ saml/builder/ util/
Author: coheigea
Date: Mon Feb 16 11:48:43 2015
New Revision: 1660079
URL: http://svn.apache.org/r1660079
Log:
More Java 7 work for ws-security-commons
Modified:
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/SignatureEncryptionActionToken.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/MemoryReplayCache.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/AlgorithmSuite.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/Attachment.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLCallback.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/SignatureEncryptionActionToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/SignatureEncryptionActionToken.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/SignatureEncryptionActionToken.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/SignatureEncryptionActionToken.java Mon Feb 16 11:48:43 2015
@@ -45,7 +45,7 @@ public abstract class SignatureEncryptio
private String keyIdentifier;
private int keyIdentifierId;
private String digestAlgorithm;
- private List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+ private List<WSEncryptionPart> parts = new ArrayList<>();
private String optionalParts;
private String cryptoProperties;
private String tokenType;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/MemoryReplayCache.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/MemoryReplayCache.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/MemoryReplayCache.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/cache/MemoryReplayCache.java Mon Feb 16 11:48:43 2015
@@ -39,7 +39,7 @@ public class MemoryReplayCache implement
public static final long DEFAULT_TTL = 60L * 5L;
public static final long MAX_TTL = DEFAULT_TTL * 12L;
- private final SortedMap<Date, List<String>> cache = new TreeMap<Date, List<String>>();
+ private final SortedMap<Date, List<String>> cache = new TreeMap<>();
private final Set<String> ids = Collections.synchronizedSet(new HashSet<String>());
/**
@@ -72,7 +72,7 @@ public class MemoryReplayCache implement
synchronized (cache) {
List<String> list = cache.get(expires);
if (list == null) {
- list = new ArrayList<String>(1);
+ list = new ArrayList<>(1);
cache.put(expires, list);
}
list.add(identifier);
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/AlgorithmSuite.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/AlgorithmSuite.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/AlgorithmSuite.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/AlgorithmSuite.java Mon Feb 16 11:48:43 2015
@@ -50,7 +50,7 @@ public class AlgorithmSuite {
public void addSignatureMethod(String signatureMethod) {
if (signatureMethods.isEmpty()) {
- signatureMethods = new HashSet<String>();
+ signatureMethods = new HashSet<>();
}
signatureMethods.add(signatureMethod);
}
@@ -61,7 +61,7 @@ public class AlgorithmSuite {
public void addC14nAlgorithm(String c14nAlgorithm) {
if (c14nAlgorithms.isEmpty()) {
- c14nAlgorithms = new HashSet<String>();
+ c14nAlgorithms = new HashSet<>();
}
c14nAlgorithms.add(c14nAlgorithm);
}
@@ -72,7 +72,7 @@ public class AlgorithmSuite {
public void addDigestAlgorithm(String digestAlgorithm) {
if (digestAlgorithms.isEmpty()) {
- digestAlgorithms = new HashSet<String>();
+ digestAlgorithms = new HashSet<>();
}
digestAlgorithms.add(digestAlgorithm);
}
@@ -83,7 +83,7 @@ public class AlgorithmSuite {
public void addTransformAlgorithm(String transformAlgorithm) {
if (transformAlgorithms.isEmpty()) {
- transformAlgorithms = new HashSet<String>();
+ transformAlgorithms = new HashSet<>();
}
transformAlgorithms.add(transformAlgorithm);
}
@@ -94,7 +94,7 @@ public class AlgorithmSuite {
public void addEncryptionMethod(String encryptionMethod) {
if (encryptionMethods.isEmpty()) {
- encryptionMethods = new HashSet<String>();
+ encryptionMethods = new HashSet<>();
}
encryptionMethods.add(encryptionMethod);
}
@@ -105,7 +105,7 @@ public class AlgorithmSuite {
public void addKeyWrapAlgorithm(String keyWrapAlgorithm) {
if (keyWrapAlgorithms.isEmpty()) {
- keyWrapAlgorithms = new HashSet<String>();
+ keyWrapAlgorithms = new HashSet<>();
}
keyWrapAlgorithms.add(keyWrapAlgorithm);
}
@@ -116,7 +116,7 @@ public class AlgorithmSuite {
public void addDerivedKeyAlgorithm(String derivedKeyAlgorithm) {
if (derivedKeyAlgorithms.isEmpty()) {
- derivedKeyAlgorithms = new HashSet<String>();
+ derivedKeyAlgorithms = new HashSet<>();
}
derivedKeyAlgorithms.add(derivedKeyAlgorithm);
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java Mon Feb 16 11:48:43 2015
@@ -226,7 +226,7 @@ public class CertificateStore extends Cr
List<X509Certificate> certList = Arrays.asList(x509certs);
CertPath path = getCertificateFactory().generateCertPath(certList);
- Set<TrustAnchor> set = new HashSet<TrustAnchor>();
+ Set<TrustAnchor> set = new HashSet<>();
if (trustedCerts != null) {
for (X509Certificate cert : trustedCerts) {
TrustAnchor anchor =
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CryptoBase.java Mon Feb 16 11:48:43 2015
@@ -61,8 +61,7 @@ public abstract class CryptoBase impleme
private static final Constructor<?> BC_509CLASS_CONS;
- protected Map<String, CertificateFactory> certFactMap =
- new HashMap<String, CertificateFactory>();
+ protected Map<String, CertificateFactory> certFactMap = new HashMap<>();
protected String defaultAlias = null;
protected String cryptoProvider = null;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java Mon Feb 16 11:48:43 2015
@@ -815,7 +815,7 @@ public class Merlin extends CryptoBase {
List<X509Certificate> certList = Arrays.asList(x509certs);
CertPath path = getCertificateFactory().generateCertPath(certList);
- Set<TrustAnchor> set = new HashSet<TrustAnchor>();
+ Set<TrustAnchor> set = new HashSet<>();
if (truststore != null) {
Enumeration<String> truststoreAliases = truststore.aliases();
while (truststoreAliases.hasMoreElements()) {
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/Attachment.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/Attachment.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/Attachment.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/Attachment.java Mon Feb 16 11:48:43 2015
@@ -26,7 +26,7 @@ public class Attachment {
private String id;
private String mimeType;
- private final Map<String, String> headers = new HashMap<String, String>();
+ private final Map<String, String> headers = new HashMap<>();
private InputStream sourceStream;
public String getId() {
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLCallback.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLCallback.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLCallback.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SAMLCallback.java Mon Feb 16 11:48:43 2015
@@ -108,9 +108,9 @@ public class SAMLCallback implements Cal
* Constructor SAMLCallback creates a new SAMLCallback instance.
*/
public SAMLCallback() {
- authenticationStatementData = new ArrayList<AuthenticationStatementBean>();
- attributeStatementData = new ArrayList<AttributeStatementBean>();
- authDecisionStatementData = new ArrayList<AuthDecisionStatementBean>();
+ authenticationStatementData = new ArrayList<>();
+ attributeStatementData = new ArrayList<>();
+ authDecisionStatementData = new ArrayList<>();
}
/**
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/SamlAssertionWrapper.java Mon Feb 16 11:48:43 2015
@@ -373,7 +373,7 @@ public class SamlAssertionWrapper {
* @return the confirmationMethods of this SamlAssertionWrapper object.
*/
public List<String> getConfirmationMethods() {
- List<String> methods = new ArrayList<String>();
+ List<String> methods = new ArrayList<>();
if (saml2 != null) {
org.opensaml.saml.saml2.core.Subject subject = saml2.getSubject();
List<org.opensaml.saml.saml2.core.SubjectConfirmation> confirmations =
@@ -382,7 +382,7 @@ public class SamlAssertionWrapper {
methods.add(confirmation.getMethod());
}
} else if (saml1 != null) {
- List<SubjectStatement> subjectStatements = new ArrayList<SubjectStatement>();
+ List<SubjectStatement> subjectStatements = new ArrayList<>();
subjectStatements.addAll(saml1.getSubjectStatements());
subjectStatements.addAll(saml1.getAuthenticationStatements());
subjectStatements.addAll(saml1.getAttributeStatements());
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AdviceBean.java Mon Feb 16 11:48:43 2015
@@ -30,9 +30,9 @@ import org.w3c.dom.Element;
*/
public class AdviceBean {
- private List<String> idReferences = new ArrayList<String>();
- private List<String> uriReferences = new ArrayList<String>();
- private List<Element> assertions = new ArrayList<Element>();
+ private List<String> idReferences = new ArrayList<>();
+ private List<String> uriReferences = new ArrayList<>();
+ private List<Element> assertions = new ArrayList<>();
public List<String> getIdReferences() {
return idReferences;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AttributeBean.java Mon Feb 16 11:48:43 2015
@@ -35,7 +35,7 @@ public class AttributeBean {
* Constructor SamlAttribute creates a new SamlAttribute instance.
*/
public AttributeBean() {
- attributeValues = new ArrayList<Object>();
+ attributeValues = new ArrayList<>();
}
/**
@@ -125,7 +125,7 @@ public class AttributeBean {
public void addAttributeValue(Object attributeValue) {
if (attributeValues == null) {
- attributeValues = new ArrayList<Object>();
+ attributeValues = new ArrayList<>();
}
attributeValues.add(attributeValue);
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AudienceRestrictionBean.java Mon Feb 16 11:48:43 2015
@@ -26,7 +26,7 @@ import java.util.List;
* Class AudienceRestrictionBean represents a SAML AudienceRestriction object
*/
public class AudienceRestrictionBean {
- private final List<String> audienceURIs = new ArrayList<String>();
+ private final List<String> audienceURIs = new ArrayList<>();
/**
* Constructor AudienceRestrictionBean creates a new AudienceRestrictionBean instance.
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/AuthDecisionStatementBean.java Mon Feb 16 11:48:43 2015
@@ -63,7 +63,7 @@ public class AuthDecisionStatementBean {
* Constructor SamlDecision creates a new SamlDecision instance.
*/
public AuthDecisionStatementBean() {
- actionBeans = new ArrayList<ActionBean>();
+ actionBeans = new ArrayList<>();
}
/**
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/ProxyRestrictionBean.java Mon Feb 16 11:48:43 2015
@@ -27,7 +27,7 @@ import java.util.List;
*/
public class ProxyRestrictionBean {
private int count;
- private final List<String> audienceURIs = new ArrayList<String>();
+ private final List<String> audienceURIs = new ArrayList<>();
/**
* Constructor ProxyRestrictionBean creates a new ProxyRestrictionBean instance.
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java Mon Feb 16 11:48:43 2015
@@ -389,8 +389,7 @@ public final class SAML1ComponentBuilder
public static List<AuthenticationStatement> createSamlv1AuthenticationStatement(
List<AuthenticationStatementBean> authBeans
) throws org.opensaml.security.SecurityException, WSSecurityException {
- List<AuthenticationStatement> authenticationStatements =
- new ArrayList<AuthenticationStatement>();
+ List<AuthenticationStatement> authenticationStatements = new ArrayList<>();
if (authenticationStatementV1Builder == null) {
authenticationStatementV1Builder = (SAMLObjectBuilder<AuthenticationStatement>)
@@ -474,7 +473,7 @@ public final class SAML1ComponentBuilder
builderFactory.getBuilder(AttributeStatement.DEFAULT_ELEMENT_NAME);
}
- List<AttributeStatement> attributeStatements = new ArrayList<AttributeStatement>();
+ List<AttributeStatement> attributeStatements = new ArrayList<>();
if (attributeData != null && attributeData.size() > 0) {
for (AttributeStatementBean statementBean : attributeData) {
@@ -553,8 +552,7 @@ public final class SAML1ComponentBuilder
public static List<AuthorizationDecisionStatement> createSamlv1AuthorizationDecisionStatement(
List<AuthDecisionStatementBean> decisionData)
throws org.opensaml.security.SecurityException, WSSecurityException {
- List<AuthorizationDecisionStatement> authDecisionStatements =
- new ArrayList<AuthorizationDecisionStatement>();
+ List<AuthorizationDecisionStatement> authDecisionStatements = new ArrayList<>();
if (authorizationDecisionStatementV1Builder == null) {
authorizationDecisionStatementV1Builder =
(SAMLObjectBuilder<AuthorizationDecisionStatement>)
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java Mon Feb 16 11:48:43 2015
@@ -388,7 +388,7 @@ public final class SAML2ComponentBuilder
public static List<AuthnStatement> createAuthnStatement(
List<AuthenticationStatementBean> authBeans
) {
- List<AuthnStatement> authnStatements = new ArrayList<AuthnStatement>();
+ List<AuthnStatement> authnStatements = new ArrayList<>();
if (authnStatementBuilder == null) {
authnStatementBuilder = (SAMLObjectBuilder<AuthnStatement>)
@@ -656,7 +656,7 @@ public final class SAML2ComponentBuilder
public static List<AttributeStatement> createAttributeStatement(
List<AttributeStatementBean> attributeData
) {
- List<AttributeStatement> attributeStatements = new ArrayList<AttributeStatement>();
+ List<AttributeStatement> attributeStatements = new ArrayList<>();
if (attributeStatementBuilder == null) {
attributeStatementBuilder = (SAMLObjectBuilder<AttributeStatement>)
builderFactory.getBuilder(AttributeStatement.DEFAULT_ELEMENT_NAME);
@@ -720,8 +720,7 @@ public final class SAML2ComponentBuilder
public static List<AuthzDecisionStatement> createAuthorizationDecisionStatement(
List<AuthDecisionStatementBean> decisionData
) {
- List<AuthzDecisionStatement> authDecisionStatements =
- new ArrayList<AuthzDecisionStatement>();
+ List<AuthzDecisionStatement> authDecisionStatements = new ArrayList<>();
if (authorizationDecisionStatementBuilder == null) {
authorizationDecisionStatementBuilder =
(SAMLObjectBuilder<AuthzDecisionStatement>)
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java Mon Feb 16 11:48:43 2015
@@ -65,7 +65,7 @@ public class AttachmentUtils {
public static final String PARAM_SIZE = "size";
public static final String PARAM_TYPE = "type";
- public static final Set<String> ALL_PARAMS = new HashSet<String>();
+ public static final Set<String> ALL_PARAMS = new HashSet<>();
static {
ALL_PARAMS.add(PARAM_CHARSET);
@@ -83,7 +83,7 @@ public class AttachmentUtils {
//5.4.1 MIME header canonicalization:
//3. sorting
- Map<String, String> sortedHeaders = new TreeMap<String, String>();
+ Map<String, String> sortedHeaders = new TreeMap<>();
Iterator<Map.Entry<String, String>> iterator = headers.entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry<String, String> next = iterator.next();
@@ -237,7 +237,7 @@ public class AttachmentUtils {
//10. lower case
stringBuilder.append(params[0].toLowerCase());
- TreeMap<String, String> paramMap = new TreeMap<String, String>();
+ TreeMap<String, String> paramMap = new TreeMap<>();
String parameterName = null;
String parameterValue = null;
@@ -429,7 +429,7 @@ public class AttachmentUtils {
Map<String, String> headers, InputStream attachmentInputStream) throws IOException, WSSecurityException {
//read and replace headers
- List<String> headerLines = new ArrayList<String>();
+ List<String> headerLines = new ArrayList<>();
StringBuilder stringBuilder = new StringBuilder();
boolean cr = false;
int ch;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java?rev=1660079&r1=1660078&r2=1660079&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java Mon Feb 16 11:48:43 2015
@@ -112,7 +112,7 @@ public class NSStack {
if (stack[top] == null) {
return null;
}
- List<Mapping> clone = new ArrayList<Mapping>();
+ List<Mapping> clone = new ArrayList<>();
for (Mapping map = topOfFrame(); map != null; map = next()) {
clone.add(map);
}