[java-metadata-aggregator] 01/02: MDA-228 - Reduce Guava dependence
Ian Young
ian at iay.org.uk
Wed Apr 15 11:56:59 EDT 2020
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch master
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=09435eaebb4a7b6142fb427ce8b1e989db549287
commit 09435eaebb4a7b6142fb427ce8b1e989db549287
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Wed Apr 15 16:43:29 2020 +0100
MDA-228 - Reduce Guava dependence
https://issues.shibboleth.net/jira/browse/MDA-228
---
.../net/shibboleth/metadata/dom/XMLSignatureSigningStage.java | 9 +++------
.../java/net/shibboleth/metadata/dom/XMLSignatureValidator.java | 6 ++----
.../dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java | 5 +----
.../shibboleth/metadata/dom/XMLSignatureValidationStageTest.java | 2 +-
.../pipeline/FilesInDirectoryMultiOutputStrategyTest.java | 7 +++----
5 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
index 36b8127..5018312 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
@@ -17,8 +17,8 @@
package net.shibboleth.metadata.dom;
-import java.io.InputStreamReader;
import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.cert.X509CRL;
@@ -59,8 +59,6 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.google.common.io.CharStreams;
-
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.dom.ds.XMLDSIGSupport;
import net.shibboleth.metadata.pipeline.AbstractIteratingStage;
@@ -652,9 +650,8 @@ public class XMLSignatureSigningStage extends AbstractIteratingStage<Element> {
// Log the pre-digest data for debugging
if (isDebugPreDigest() && log.isDebugEnabled()) {
- final Reference ref = (Reference) signature.getSignedInfo().getReferences().get(0);
- final String preDigest =
- CharStreams.toString(new InputStreamReader(ref.getDigestInputStream(), "UTF-8"));
+ final Reference ref = signature.getSignedInfo().getReferences().get(0);
+ final String preDigest = new String(ref.getDigestInputStream().readAllBytes(), StandardCharsets.UTF_8);
log.debug("pre digest: {}", preDigest);
}
} catch (final Exception e) {
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.java
index 164280d..a2e903a 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.java
@@ -50,8 +50,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import com.google.common.base.Strings;
-
/**
* A class that encapsulates the various stages in validation of XML signatures as methods.
*
@@ -171,7 +169,7 @@ final class XMLSignatureValidator {
* If the reference is empty, it implicitly references the document element
* and no attribute is being referenced.
*/
- if (Strings.isNullOrEmpty(referenceURI)) {
+ if (referenceURI.isEmpty()) {
log.debug("reference was empty; no ID marking required");
return;
}
@@ -317,7 +315,7 @@ final class XMLSignatureValidator {
throw new ValidationException("Signature Reference was null");
}
if (!emptyReferencePermitted) {
- if (Strings.isNullOrEmpty(ref.getURI())) {
+ if (ref.getURI().isEmpty()) {
throw new ValidationException("empty references are not permitted");
}
}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java
index d210059..374e7ab 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthorityPopulationStage.java
@@ -22,8 +22,6 @@ import javax.annotation.concurrent.ThreadSafe;
import org.w3c.dom.Element;
-import com.google.common.base.Strings;
-
import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemMetadata;
@@ -58,8 +56,7 @@ public class RegistrationAuthorityPopulationStage extends AbstractIteratingStage
// Extract registrationAuthority
final String attr = AttributeSupport.getAttributeValue(regInfo, null, "registrationAuthority");
if (attr == null) {
- final String eid = Strings.nullToEmpty(
- AttributeSupport.getAttributeValue(entity, null, "entityID"));
+ final String eid = entity.getAttribute("entityID");
metadata.put(new ErrorStatus(getId(), "RegistrationInfo for " + eid +
" did not have a RegistrationAuthority attribute"));
} else {
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
index 979db81..1662f4c 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XMLSignatureValidationStageTest.java
@@ -268,6 +268,6 @@ public class XMLSignatureValidationStageTest extends BaseDOMTest {
final List<ErrorStatus> errors = result.getItemMetadata().get(ErrorStatus.class);
Assert.assertEquals(errors.size(), 1);
final String message = errors.get(0).getStatusMessage();
- Assert.assertTrue(message.contains("reference"));
+ Assert.assertTrue(message.contains("empty references are not permitted"));
}
}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java
index bcae44e..c1eaeb4 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/FilesInDirectoryMultiOutputStrategyTest.java
@@ -20,13 +20,12 @@ package net.shibboleth.metadata.pipeline;
import java.io.File;
import java.io.OutputStream;
+import java.nio.file.Files;
import java.util.function.Function;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.io.Files;
-
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.ItemId;
import net.shibboleth.metadata.MockItem;
@@ -49,7 +48,7 @@ public class FilesInDirectoryMultiOutputStrategyTest {
// Test with a prefix, a suffix, and an ID transform that doubles the name
@Test public void testFull() throws Exception {
- final File tempDir = Files.createTempDir();
+ final File tempDir = Files.createTempDirectory("FilesInDirectoryMultiOutputStrategyTest").toFile();
//System.out.println("temp dir: " + tempDir.getAbsolutePath());
final FilesInDirectoryMultiOutputStrategy<String> strategy = new FilesInDirectoryMultiOutputStrategy<>();
@@ -79,7 +78,7 @@ public class FilesInDirectoryMultiOutputStrategyTest {
// Test with defaults
@Test public void testDefaults() throws Exception {
- final File tempDir = Files.createTempDir();
+ final File tempDir = Files.createTempDirectory("FilesInDirectoryMultiOutputStrategyTest").toFile();
//System.out.println("temp dir: " + tempDir.getAbsolutePath());
final FilesInDirectoryMultiOutputStrategy<String> strategy = new FilesInDirectoryMultiOutputStrategy<>();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list