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 2020/10/08 06:16:40 UTC
[santuario-xml-security-java] branch master updated: Using
.length() == 0 instead of comparing against an empty String for efficiency
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/santuario-xml-security-java.git
The following commit(s) were added to refs/heads/master by this push:
new 483d44b Using .length() == 0 instead of comparing against an empty String for efficiency
483d44b is described below
commit 483d44b3b1d36c7245f8e71ab143020f47052390
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Oct 8 07:15:58 2020 +0100
Using .length() == 0 instead of comparing against an empty String for efficiency
---
.../algorithms/implementations/IntegrityHmac.java | 2 +-
.../impl/resourceResolvers/ResolverFilesystem.java | 2 +-
.../stax/impl/resourceResolvers/ResolverHttp.java | 2 +-
.../implementations/ResolverDirectHTTP.java | 2 +-
.../implementations/ResolverLocalFilesystem.java | 2 +-
.../crypto/test/dsig/JSRForbiddenRefCountTest.java | 2 +-
.../dom/c14n/implementations/Bug45961Test.java | 2 +-
.../c14n/implementations/Canonicalizer11Test.java | 2 +-
.../Canonicalizer20010315ExclusiveTest.java | 2 +-
.../implementations/Canonicalizer20010315Test.java | 2 +-
.../implementations/ExclusiveC14NInteropTest.java | 2 +-
.../test/dom/encryption/BaltimoreEncTest.java | 8 +++---
.../test/dom/encryption/XMLCipherTest.java | 2 +-
.../test/dom/encryption/XMLEncryption11Test.java | 32 +++++++++++-----------
.../security/test/dom/interop/BaltimoreTest.java | 2 +-
.../xml/security/test/dom/interop/IAIKTest.java | 2 +-
.../security/test/dom/interop/RSASecurityTest.java | 2 +-
.../keys/content/x509/XMLX509CertificateTest.java | 2 +-
.../test/dom/keys/content/x509/XMLX509SKITest.java | 2 +-
.../keys/content/x509/XMLX509SubjectNameTest.java | 2 +-
.../test/dom/keys/keyresolver/KeyResolverTest.java | 2 +-
.../keyresolver/RetrievalMethodResolverTest.java | 4 +--
.../dom/secure_val/ForbiddenAlgorithmTest.java | 2 +-
.../dom/secure_val/ForbiddenReferenceTest.java | 2 +-
.../secure_val/ForbiddenRetrievalMethodTest.java | 2 +-
.../test/dom/secure_val/WrappingAttackTest.java | 4 +--
.../test/dom/signature/CreateSignatureTest.java | 6 ++--
.../test/dom/signature/ECDSASignatureTest.java | 2 +-
.../security/test/dom/signature/KeyValueTest.java | 2 +-
.../security/test/dom/signature/NoKeyInfoTest.java | 2 +-
.../PreCalculatedDigestSignatureTest.java | 2 +-
.../dom/signature/ProcessingInstructionTest.java | 2 +-
.../dom/signature/UnknownAlgoSignatureTest.java | 4 +--
.../security/test/dom/signature/X509DataTest.java | 2 +-
.../implementations/TransformXSLTTest.java | 2 +-
.../test/dom/utils/resolver/OfflineResolver.java | 2 +-
.../test/stax/encryption/BaltimoreEncTest.java | 4 +--
.../test/stax/encryption/DecryptionTest.java | 2 +-
.../test/stax/signature/SignatureCreationTest.java | 2 +-
39 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java b/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
index 64c9ca3..7a5dda4 100644
--- a/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
+++ b/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
@@ -305,7 +305,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
Node n = XMLUtils.selectDsNode(element.getFirstChild(), Constants._TAG_HMACOUTPUTLENGTH, 0);
if (n != null) {
String hmacLength = XMLUtils.getFullTextChildrenFromNode(n);
- if (hmacLength != null && !"".equals(hmacLength)) {
+ if (hmacLength != null && hmacLength.length() != 0) {
this.hmacOutputLength = new HMACOutputLength(Integer.parseInt(hmacLength));
}
}
diff --git a/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverFilesystem.java b/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverFilesystem.java
index 14621b4..1e55080 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverFilesystem.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverFilesystem.java
@@ -74,7 +74,7 @@ public class ResolverFilesystem implements ResourceResolver, ResourceResolverLoo
public InputStream getInputStreamFromExternalReference() throws XMLSecurityException {
try {
URI tmp;
- if (baseURI == null || "".equals(baseURI)) {
+ if (baseURI == null || baseURI.length() == 0) {
tmp = new URI(uri);
} else {
tmp = new URI(baseURI).resolve(uri);
diff --git a/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverHttp.java b/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverHttp.java
index be432e1..20b9ad5 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverHttp.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverHttp.java
@@ -82,7 +82,7 @@ public class ResolverHttp implements ResourceResolver, ResourceResolverLookup {
public InputStream getInputStreamFromExternalReference() throws XMLSecurityException {
try {
URI tmp;
- if (baseURI == null || "".equals(baseURI)) {
+ if (baseURI == null || baseURI.length() == 0) {
tmp = new URI(uri);
} else {
tmp = new URI(baseURI).resolve(uri);
diff --git a/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java b/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
index 9a1403e..b23ba9e 100644
--- a/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
+++ b/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
@@ -227,7 +227,7 @@ public class ResolverDirectHTTP extends ResourceResolverSpi {
private static URI getNewURI(String uri, String baseURI) throws URISyntaxException {
URI newUri = null;
- if (baseURI == null || "".equals(baseURI)) {
+ if (baseURI == null || baseURI.length() == 0) {
newUri = new URI(uri);
} else {
newUri = new URI(baseURI).resolve(uri);
diff --git a/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java b/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
index 5717944..91d52f3 100644
--- a/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
+++ b/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
@@ -129,7 +129,7 @@ public class ResolverLocalFilesystem extends ResourceResolverSpi {
private static URI getNewURI(String uri, String baseURI) throws URISyntaxException {
URI newUri = null;
- if (baseURI == null || "".equals(baseURI)) {
+ if (baseURI == null || baseURI.length() == 0) {
newUri = new URI(uri);
} else {
newUri = new URI(baseURI).resolve(uri);
diff --git a/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenRefCountTest.java b/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenRefCountTest.java
index e7632bd..2f2dfb7 100644
--- a/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenRefCountTest.java
+++ b/src/test/java/javax/xml/crypto/test/dsig/JSRForbiddenRefCountTest.java
@@ -68,7 +68,7 @@ public class JSRForbiddenRefCountTest {
String directory, String file
) throws Exception {
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
directory = basedir + "/" + directory;
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java
index ffa4525..469ca11 100644
--- a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java
+++ b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Bug45961Test.java
@@ -119,7 +119,7 @@ public class Bug45961Test {
private String getAbsolutePath(String path) {
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
path = basedir + "/" + path;
}
return path;
diff --git a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
index f64ff36..50c8f90 100644
--- a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
+++ b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
@@ -59,7 +59,7 @@ public class Canonicalizer11Test {
public Canonicalizer11Test() {
prefix = "src/test/resources/org/apache/xml/security/c14n/";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
prefix = basedir + "/" + prefix;
}
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
index 289db38..c4de623 100644
--- a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
@@ -733,7 +733,7 @@ public class Canonicalizer20010315ExclusiveTest {
private String getAbsolutePath(String path) {
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
path = basedir + "/" + path;
}
return path;
diff --git a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
index ecae529..dcee8f3 100644
--- a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
+++ b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
@@ -70,7 +70,7 @@ public class Canonicalizer20010315Test {
public Canonicalizer20010315Test() {
prefix = "src/test/resources/org/apache/xml/security/c14n/";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
prefix = basedir + "/" + prefix;
}
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
index 5d2f0be..c70fbd4 100644
--- a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/ExclusiveC14NInteropTest.java
@@ -114,7 +114,7 @@ public class ExclusiveC14NInteropTest extends InteropTestBase {
private String t(String directory, String file, boolean secureValidation) throws Exception {
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
directory = basedir + "/" + directory;
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java b/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
index 18357c5..5aec3ad 100644
--- a/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
@@ -89,7 +89,7 @@ public class BaltimoreEncTest {
String filename =
"src/test/resources/ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
File f = new File(filename);
@@ -114,7 +114,7 @@ public class BaltimoreEncTest {
// rsaKey
filename = "src/test/resources/ie/baltimore/merlin-examples/merlin-xmlenc-five/rsa.p8";
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
@@ -392,7 +392,7 @@ public class BaltimoreEncTest {
// Parse the document in question
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
File f = new File(filename);
@@ -431,7 +431,7 @@ public class BaltimoreEncTest {
// Parse the document in question
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
File f = new File(filename);
diff --git a/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java b/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
index d190e87..57d5092 100644
--- a/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
@@ -866,7 +866,7 @@ public class XMLCipherTest {
public void testEncryptedKeyWithRecipient() throws Exception {
String filename =
"src/test/resources/org/apache/xml/security/encryption/encryptedKey.xml";
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
File f = new File(filename);
diff --git a/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java b/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
index 8ead1d8..86ebbb8 100644
--- a/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
+++ b/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
@@ -85,7 +85,7 @@ public class XMLEncryption11Test {
String filename =
"src/test/resources/org/w3c/www/interop/xmlenc-core-11/plaintext.xml";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
File f = new File(filename);
@@ -128,7 +128,7 @@ public class XMLEncryption11Test {
String keystore =
"src/test/resources/org/w3c/www/interop/xmlenc-core-11/RSA-2048_SHA256WithRSA.jks";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
keystore = basedir + "/" + keystore;
}
@@ -168,7 +168,7 @@ public class XMLEncryption11Test {
String keystore =
"src/test/resources/org/w3c/www/interop/xmlenc-core-11/RSA-2048_SHA256WithRSA.jks";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
keystore = basedir + "/" + keystore;
}
@@ -183,7 +183,7 @@ public class XMLEncryption11Test {
// Perform encryption
String filename = "src/test/resources/org/w3c/www/interop/xmlenc-core-11/plaintext.xml";
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
File f = new File(filename);
@@ -232,7 +232,7 @@ public class XMLEncryption11Test {
String keystore =
"src/test/resources/org/w3c/www/interop/xmlenc-core-11/RSA-2048_SHA256WithRSA.jks";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
keystore = basedir + "/" + keystore;
}
@@ -247,7 +247,7 @@ public class XMLEncryption11Test {
// Perform encryption
String filename = "src/test/resources/org/w3c/www/interop/xmlenc-core-11/plaintext.xml";
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
File f = new File(filename);
@@ -297,7 +297,7 @@ public class XMLEncryption11Test {
String keystore =
"src/test/resources/org/w3c/www/interop/xmlenc-core-11/RSA-3072_SHA256WithRSA.jks";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
keystore = basedir + "/" + keystore;
}
@@ -336,7 +336,7 @@ public class XMLEncryption11Test {
String keystore =
"src/test/resources/org/w3c/www/interop/xmlenc-core-11/RSA-3072_SHA256WithRSA.jks";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
keystore = basedir + "/" + keystore;
}
@@ -351,7 +351,7 @@ public class XMLEncryption11Test {
// Perform encryption
String filename = "src/test/resources/org/w3c/www/interop/xmlenc-core-11/plaintext.xml";
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
File f = new File(filename);
@@ -400,7 +400,7 @@ public class XMLEncryption11Test {
String keystore =
"src/test/resources/org/w3c/www/interop/xmlenc-core-11/RSA-3072_SHA256WithRSA.jks";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
keystore = basedir + "/" + keystore;
}
@@ -437,7 +437,7 @@ public class XMLEncryption11Test {
String keystore =
"src/test/resources/org/w3c/www/interop/xmlenc-core-11/RSA-3072_SHA256WithRSA.jks";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
keystore = basedir + "/" + keystore;
}
@@ -452,7 +452,7 @@ public class XMLEncryption11Test {
// Perform encryption
String filename = "src/test/resources/org/w3c/www/interop/xmlenc-core-11/plaintext.xml";
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
File f = new File(filename);
@@ -501,7 +501,7 @@ public class XMLEncryption11Test {
String keystore =
"src/test/resources/org/w3c/www/interop/xmlenc-core-11/RSA-4096_SHA256WithRSA.jks";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
keystore = basedir + "/" + keystore;
}
@@ -538,7 +538,7 @@ public class XMLEncryption11Test {
String keystore =
"src/test/resources/org/w3c/www/interop/xmlenc-core-11/RSA-4096_SHA256WithRSA.jks";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
keystore = basedir + "/" + keystore;
}
@@ -553,7 +553,7 @@ public class XMLEncryption11Test {
// Perform encryption
String filename = "src/test/resources/org/w3c/www/interop/xmlenc-core-11/plaintext.xml";
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
File f = new File(filename);
@@ -605,7 +605,7 @@ public class XMLEncryption11Test {
private Document decryptElement(String filename, Key rsaKey, X509Certificate rsaCert) throws Exception {
// Parse the document in question
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
File f = new File(filename);
diff --git a/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java b/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java
index c4af48c..833ad72 100644
--- a/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/interop/BaltimoreTest.java
@@ -53,7 +53,7 @@ public class BaltimoreTest extends InteropTestBase {
static {
String basedir = System.getProperty("basedir");
- if(basedir != null && !"".equals(basedir)) {
+ if(basedir != null && basedir.length() != 0) {
merlinsDir15 = basedir + "/" + merlinsDir15;
merlinsDir16 = basedir + "/" + merlinsDir16;
merlinsDir23 = basedir + "/" + merlinsDir23;
diff --git a/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java b/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java
index 9627fb6..b6e0b43 100644
--- a/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/interop/IAIKTest.java
@@ -48,7 +48,7 @@ public class IAIKTest extends InteropTestBase {
static {
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
gregorsDir = basedir + "/" + gregorsDir;
}
org.apache.xml.security.Init.init();
diff --git a/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java b/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java
index 66753bc..a24a659 100644
--- a/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/interop/RSASecurityTest.java
@@ -43,7 +43,7 @@ public class RSASecurityTest extends InteropTestBase {
static {
String basedir = System.getProperty("basedir");
- if(basedir != null && !"".equals(basedir)) {
+ if(basedir != null && basedir.length() != 0) {
blakesDir = basedir + "/" + blakesDir;
}
org.apache.xml.security.Init.init();
diff --git a/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java
index 65fbfab..acbf222 100644
--- a/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509CertificateTest.java
@@ -62,7 +62,7 @@ public class XMLX509CertificateTest {
@org.junit.jupiter.api.Test
public void testEqualsAndHashCode() throws Exception {
File f = null;
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
f = new File(BASEDIR + SEP +
"src/test/resources/ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/certs/lugh.crt");
} else {
diff --git a/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java
index 5dec9e9..acb36b2 100644
--- a/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SKITest.java
@@ -52,7 +52,7 @@ public class XMLX509SKITest {
@org.junit.jupiter.api.Test
public void testGetSKIBytesFromCert() throws Exception {
File f = null;
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
f = new File(BASEDIR + SEP +
"src/test/resources/ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/certs/lugh.crt");
} else {
diff --git a/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SubjectNameTest.java b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SubjectNameTest.java
index 423d86c..237c532 100644
--- a/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SubjectNameTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/keys/content/x509/XMLX509SubjectNameTest.java
@@ -42,7 +42,7 @@ public class XMLX509SubjectNameTest {
@org.junit.jupiter.api.Test
public void testEqualsAndHashCode() throws Exception {
File f = null;
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
f = new File(BASEDIR + SEP +
"src/test/resources/ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/certs/lugh.crt");
} else {
diff --git a/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java b/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java
index 01be08d..65cd77e 100644
--- a/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/KeyResolverTest.java
@@ -93,7 +93,7 @@ public class KeyResolverTest {
char[] pwd = "secret".toCharArray();
KeyStore ks = KeyStore.getInstance("JCEKS");
FileInputStream fis = null;
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
fis = new FileInputStream(BASEDIR + SEP + "src/test/resources/test.jceks");
} else {
fis = new FileInputStream("src/test/resources/test.jceks");
diff --git a/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java b/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java
index 666bcda..9502c09 100644
--- a/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/RetrievalMethodResolverTest.java
@@ -44,7 +44,7 @@ public class RetrievalMethodResolverTest {
public void testReferenceToSameRetrievalMethod() throws Exception {
FileInputStream fis = null;
String filename = "src/test/resources/org/apache/xml/security/keyresolver/retrievalmethod1.xml";
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
fis = new FileInputStream(BASEDIR + SEP + filename);
} else {
fis = new FileInputStream(filename);
@@ -63,7 +63,7 @@ public class RetrievalMethodResolverTest {
public void testLoopBetweenRetrievalMethods() throws Exception {
FileInputStream fis = null;
String filename = "src/test/resources/org/apache/xml/security/keyresolver/retrievalmethod2.xml";
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
fis = new FileInputStream(BASEDIR + SEP + filename);
} else {
fis = new FileInputStream(filename);
diff --git a/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java b/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
index b3e6e80..37416d2 100644
--- a/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenAlgorithmTest.java
@@ -72,7 +72,7 @@ public class ForbiddenAlgorithmTest extends InteropTestBase {
String directory, String file, boolean secValidation
) throws Exception {
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
directory = basedir + "/" + directory;
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java b/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java
index dd751f8..30f9ad4 100644
--- a/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenReferenceTest.java
@@ -69,7 +69,7 @@ public class ForbiddenReferenceTest extends InteropTestBase {
String directory, String file, boolean secValidation
) throws Exception {
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
directory = basedir + "/" + directory;
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java b/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java
index 9e022ac..cd66546 100644
--- a/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/secure_val/ForbiddenRetrievalMethodTest.java
@@ -45,7 +45,7 @@ public class ForbiddenRetrievalMethodTest {
public void testMultipleRetrievalMethods() throws Exception {
FileInputStream fis = null;
String filename = "src/test/resources/org/apache/xml/security/keyresolver/retrievalmethod3.xml";
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
fis = new FileInputStream(BASEDIR + SEP + filename);
} else {
fis = new FileInputStream(filename);
diff --git a/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java b/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
index 54ac34d..fe8db6e 100644
--- a/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/secure_val/WrappingAttackTest.java
@@ -74,7 +74,7 @@ public class WrappingAttackTest extends InteropTestBase {
String directory, String file
) throws Exception {
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
directory = basedir + "/" + directory;
}
@@ -93,7 +93,7 @@ public class WrappingAttackTest extends InteropTestBase {
String directory, String file
) throws Exception {
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
directory = basedir + "/" + directory;
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java b/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
index 99d7b4b..2cb9a79 100644
--- a/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/signature/CreateSignatureTest.java
@@ -119,7 +119,7 @@ public class CreateSignatureTest {
KeyStore ks = KeyStore.getInstance("JKS");
FileInputStream fis = null;
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
fis =
new FileInputStream(BASEDIR + SEP
+ "src/test/resources/org/apache/xml/security/samples/input/keystore.jks"
@@ -183,7 +183,7 @@ public class CreateSignatureTest {
KeyStore ks = KeyStore.getInstance("JKS");
FileInputStream fis = null;
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
fis =
new FileInputStream(BASEDIR + SEP
+ "src/test/resources/org/apache/xml/security/samples/input/keystore.jks"
@@ -555,7 +555,7 @@ public class CreateSignatureTest {
private String doSignWithCert() throws Exception {
KeyStore ks = KeyStore.getInstance("JKS");
FileInputStream fis = null;
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
fis = new FileInputStream(BASEDIR + SEP +
"src/test/resources/test.jks");
} else {
diff --git a/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java b/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
index 8f18782..a28af38 100644
--- a/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
@@ -195,7 +195,7 @@ public class ECDSASignatureTest {
}
private File makeDataFile(String relPath) {
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
return new File(BASEDIR + SEP + relPath);
} else {
return new File(relPath);
diff --git a/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java b/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java
index 1b8b774..0263b61 100644
--- a/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/signature/KeyValueTest.java
@@ -49,7 +49,7 @@ public class KeyValueTest {
File f = null;
String filename =
"src/test/resources/ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-dsa.xml";
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
f = new File(BASEDIR + SEP + filename);
} else {
f = new File(filename);
diff --git a/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java b/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java
index ec6ace3..7321089 100644
--- a/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/signature/NoKeyInfoTest.java
@@ -47,7 +47,7 @@ public class NoKeyInfoTest {
File f = null;
String filename =
"src/test/resources/ie/baltimore/merlin-examples/merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1.xml";
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
f = new File(BASEDIR + SEP + filename);
} else {
f = new File(filename);
diff --git a/src/test/java/org/apache/xml/security/test/dom/signature/PreCalculatedDigestSignatureTest.java b/src/test/java/org/apache/xml/security/test/dom/signature/PreCalculatedDigestSignatureTest.java
index 9f886eb..1c9681a 100644
--- a/src/test/java/org/apache/xml/security/test/dom/signature/PreCalculatedDigestSignatureTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/signature/PreCalculatedDigestSignatureTest.java
@@ -190,7 +190,7 @@ public class PreCalculatedDigestSignatureTest {
private String getAbsolutePath(String path) {
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
path = basedir + "/" + path;
}
return path;
diff --git a/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java b/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java
index 25fe145..8a54b2c 100644
--- a/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/signature/ProcessingInstructionTest.java
@@ -138,7 +138,7 @@ public class ProcessingInstructionTest {
private static URI getNewURI(String uri, String baseURI) throws URISyntaxException {
URI newUri = null;
- if (baseURI == null || "".equals(baseURI)) {
+ if (baseURI == null || baseURI.length() == 0) {
newUri = new URI(uri);
} else {
newUri = new URI(baseURI).resolve(uri);
diff --git a/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java b/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java
index d5a7bc6..65f8a20 100644
--- a/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/signature/UnknownAlgoSignatureTest.java
@@ -70,7 +70,7 @@ public class UnknownAlgoSignatureTest {
public UnknownAlgoSignatureTest() throws Exception {
FileInputStream fis = null;
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
fis = new FileInputStream(BASEDIR + SEP + KEYSTORE_FILE);
} else {
fis = new FileInputStream(KEYSTORE_FILE);
@@ -128,7 +128,7 @@ public class UnknownAlgoSignatureTest {
private XMLSignature unmarshalXMLSignature(String fileName) throws Exception {
File file = null;
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
file = new File(BASEDIR + SEP + SIGNATURE_SOURCE_PATH, fileName);
} else {
file = new File(SIGNATURE_SOURCE_PATH, fileName);
diff --git a/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java b/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java
index 659a16b..7138f1d 100644
--- a/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/signature/X509DataTest.java
@@ -95,7 +95,7 @@ public class X509DataTest {
String keystorePass = "xmlsecurity";
ks = KeyStore.getInstance(keystoreType);
FileInputStream fis = null;
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
fis = new FileInputStream(BASEDIR + "/" + keystoreFile);
} else {
fis = new FileInputStream(keystoreFile);
diff --git a/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java b/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java
index 28b27af..7394461 100644
--- a/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/transforms/implementations/TransformXSLTTest.java
@@ -59,7 +59,7 @@ public class TransformXSLTTest {
public void test1() throws Exception {
File file1 = null;
File file2 = null;
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
file1 = new File(BASEDIR + SEP + SOURCE_PATH, SIGNATURE_FILE);
file2 = new File(BASEDIR + SEP + SOURCE_PATH, STYLESHEET_FILE);
} else {
diff --git a/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java b/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
index d31fb24..62577cd 100644
--- a/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
+++ b/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
@@ -172,7 +172,7 @@ public class OfflineResolver extends ResourceResolverSpi {
private static URI getNewURI(String uri, String baseURI) throws URISyntaxException {
URI newUri = null;
- if (baseURI == null || "".equals(baseURI)) {
+ if (baseURI == null || baseURI.length() == 0) {
newUri = new URI(uri);
} else {
newUri = new URI(baseURI).resolve(uri);
diff --git a/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java b/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
index 5c4b0f0..0ae65c2 100644
--- a/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
@@ -84,7 +84,7 @@ public class BaltimoreEncTest {
String filename =
"src/test/resources/ie/baltimore/merlin-examples/merlin-xmlenc-five/plaintext.xml";
String basedir = System.getProperty("basedir");
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
File f = new File(filename);
@@ -98,7 +98,7 @@ public class BaltimoreEncTest {
// rsaKey
filename = "src/test/resources/ie/baltimore/merlin-examples/merlin-xmlenc-five/rsa.p8";
- if (basedir != null && !"".equals(basedir)) {
+ if (basedir != null && basedir.length() != 0) {
filename = basedir + "/" + filename;
}
diff --git a/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java b/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java
index fa603ed..a5f7438 100644
--- a/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java
@@ -1257,7 +1257,7 @@ public class DecryptionTest {
}
assertTrue(matchedEncryptionAlgorithm);
- if (keywrapAlgorithm != null && !"".equals(keywrapAlgorithm)) {
+ if (keywrapAlgorithm != null && keywrapAlgorithm.length() != 0) {
assertTrue(matchedKeywrapAlgorithm);
}
}
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java
index 0d227b5..ab7db16 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationTest.java
@@ -814,7 +814,7 @@ public class SignatureCreationTest extends AbstractSignatureCreationTest {
// Set the key up
KeyStore keyStore = KeyStore.getInstance("jks");
FileInputStream fis = null;
- if (BASEDIR != null && !"".equals(BASEDIR)) {
+ if (BASEDIR != null && BASEDIR.length() != 0) {
fis =
new FileInputStream(BASEDIR + System.getProperty("file.separator")
+ "src/test/resources/org/apache/xml/security/samples/input/keystore.jks"