You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2017/07/31 11:02:52 UTC
svn commit: r1803518 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/jcp/xml/dsig/internal/dom/
main/java/org/apache/xml/security/
main/java/org/apache/xml/security/c14n/implementations/
main/java/org/apache/xml/security/encryption/ m...
Author: coheigea
Date: Mon Jul 31 11:02:52 2017
New Revision: 1803518
URL: http://svn.apache.org/viewvc?rev=1803518&view=rev
Log:
Switching to use lambdas in a few places
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherUtil.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java?rev=1803518&r1=1803517&r2=1803518&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java Mon Jul 31 11:02:52 2017
@@ -72,13 +72,8 @@ public final class DOMReference extends
* If true, overrides the same property if set in the XMLSignContext.
*/
private static boolean useC14N11 =
- AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
- @Override
- public Boolean run() {
- return Boolean.getBoolean
- ("com.sun.org.apache.xml.internal.security.useC14N11");
- }
- });
+ AccessController.doPrivileged((PrivilegedAction<Boolean>)
+ () -> Boolean.getBoolean("com.sun.org.apache.xml.internal.security.useC14N11"));
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DOMReference.class);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java?rev=1803518&r1=1803517&r2=1803518&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java Mon Jul 31 11:02:52 2017
@@ -147,12 +147,7 @@ public final class XMLDSigRI extends Pro
map.put("Alg.Alias.TransformService.XSLT", Transform.XSLT);
map.put("TransformService." + Transform.XSLT + " MechanismType", "DOM");
- AccessController.doPrivileged(new PrivilegedAction<Void>() {
- @Override
- public Void run() {
- putAll(map);
- return null;
- }
- });
+ AccessController.doPrivileged((PrivilegedAction<Void>)
+ () -> {putAll(map); return null;});
}
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java?rev=1803518&r1=1803517&r2=1803518&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java Mon Jul 31 11:02:52 2017
@@ -78,16 +78,16 @@ public class Init {
InputStream is =
AccessController.doPrivileged(
- new PrivilegedAction<InputStream>() {
- public InputStream run() {
+ (PrivilegedAction<InputStream>)
+ () -> {
String cfile =
System.getProperty("org.apache.xml.security.resource.config");
if (cfile == null) {
return null;
}
- return getClass().getResourceAsStream(cfile);
+ return Init.class.getResourceAsStream(cfile);
}
- });
+ );
if (is == null) {
dynamicInit();
} else {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java?rev=1803518&r1=1803517&r2=1803518&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java Mon Jul 31 11:02:52 2017
@@ -33,12 +33,8 @@ public final class UtfHelpper {
* XML document.
*/
private static final boolean OLD_UTF8 =
- AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
- public Boolean run() {
- return Boolean.getBoolean
- ("org.apache.xml.security.c14n.oldUtf8");
- }
- });
+ AccessController.doPrivileged((PrivilegedAction<Boolean>)
+ () -> Boolean.getBoolean("org.apache.xml.security.c14n.oldUtf8"));
private UtfHelpper() {
// complete
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherUtil.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherUtil.java?rev=1803518&r1=1803517&r2=1803518&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherUtil.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipherUtil.java Mon Jul 31 11:02:52 2017
@@ -33,12 +33,8 @@ public final class XMLCipherUtil {
org.slf4j.LoggerFactory.getLogger(XMLCipherUtil.class);
private static final boolean gcmUseIvParameterSpec =
- AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
- public Boolean run() {
- return Boolean.getBoolean
- ("org.apache.xml.security.cipher.gcm.useIvParameterSpec");
- }
- });
+ AccessController.doPrivileged((PrivilegedAction<Boolean>)
+ () -> Boolean.getBoolean("org.apache.xml.security.cipher.gcm.useIvParameterSpec"));
/**
* Build an <code>AlgorithmParameterSpec</code> instance used to initialize a <code>Cipher</code> instance
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java?rev=1803518&r1=1803517&r2=1803518&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java Mon Jul 31 11:02:52 2017
@@ -120,11 +120,8 @@ public class Reference extends Signature
* 3.1.1 of http://www.w3.org/2007/xmlsec/Drafts/xmldsig-core/ for more info.
*/
private static boolean useC14N11 =
- AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
- public Boolean run() {
- return Boolean.getBoolean("org.apache.xml.security.useC14N11");
- }
- });
+ AccessController.doPrivileged((PrivilegedAction<Boolean>)
+ () -> Boolean.getBoolean("org.apache.xml.security.useC14N11"));
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(Reference.class);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java?rev=1803518&r1=1803517&r2=1803518&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/IgnoreAllErrorHandler.java Mon Jul 31 11:02:52 2017
@@ -42,13 +42,7 @@ public class IgnoreAllErrorHandler imple
private static boolean getProperty(final String name) {
return java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction<Boolean>() {
-
- @Override
- public Boolean run() {
- return Boolean.getBoolean(name);
- }
- });
+ (java.security.PrivilegedAction<Boolean>) () -> Boolean.getBoolean(name));
}
/** {@inheritDoc} */
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java?rev=1803518&r1=1803517&r2=1803518&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java Mon Jul 31 11:02:52 2017
@@ -60,12 +60,8 @@ import org.xml.sax.SAXException;
public final class XMLUtils {
private static boolean ignoreLineBreaks =
- AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
- public Boolean run() {
- return Boolean.getBoolean
- ("org.apache.xml.security.ignoreLineBreaks");
- }
- });
+ AccessController.doPrivileged(
+ (PrivilegedAction<Boolean>) () -> Boolean.getBoolean("org.apache.xml.security.ignoreLineBreaks"));
@SuppressWarnings("unchecked")
private static final WeakObjectPool<DocumentBuilder, ParserConfigurationException> pools[] = new WeakObjectPool[4];
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java?rev=1803518&r1=1803517&r2=1803518&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ClassLoaderTest.java Mon Jul 31 11:02:52 2017
@@ -80,12 +80,8 @@ public class ClassLoaderTest extends org
(urls, Thread.currentThread().getContextClassLoader());
//load security provider using current class loader
final Provider provider = new XMLDSigRI();
- AccessController.doPrivileged(new java.security.PrivilegedAction<Object>() {
- public Object run() {
- Security.addProvider(provider);
- return null;
- }
- });
+ AccessController.doPrivileged((java.security.PrivilegedAction<Object>)
+ () -> Security.addProvider(provider));
// get the provider from java.security.Security using URLClassLoader.
// Need to use introspection to invoke methods to avoid using the
// current class loader