[xmlsectool] 01/02: Move blacklist listing code out into Blacklist class.

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository xmlsectool.

commit 45246601fe5d701ac34cd23bd0c825120a49aab7
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Sun May 15 04:41:52 2016 +0100

    Move blacklist listing code out into Blacklist class.
---
 .../net/shibboleth/tool/xmlsectool/Blacklist.java  | 27 +++++++++++++++++++++
 .../net/shibboleth/tool/xmlsectool/XmlSecTool.java | 28 +---------------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/Blacklist.java b/src/main/java/net/shibboleth/tool/xmlsectool/Blacklist.java
index 53fe744..9fe1e5a 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/Blacklist.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/Blacklist.java
@@ -17,6 +17,7 @@
 
 package net.shibboleth.tool.xmlsectool;
 
+import java.io.PrintStream;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
@@ -162,4 +163,30 @@ public class Blacklist {
         digestBlacklist.clear();
         signatureBlacklist.clear();
     }
+    
+    /**
+     * List out the contents of the blacklist.
+     * 
+     * @param out stream to send the listing to
+     */
+    public void list(final PrintStream out) {
+        out.println("Digest algorithm blacklist:");
+        if (getDigestBlacklist().isEmpty()) {
+            out.println("   blacklist is empty");
+        } else {
+            for (final String uri: getDigestBlacklist()) {
+                out.println("   " + uri);
+            }
+        }
+        out.println();
+        out.println("Signature algorithm blacklist:");
+        if (getSignatureBlacklist().isEmpty()) {
+            out.println("   blacklist is empty");
+        } else {
+            for (final String uri: getSignatureBlacklist()) {
+                out.println("   " + uri);
+            }
+        }
+        out.println();
+    }
 }
diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/XmlSecTool.java b/src/main/java/net/shibboleth/tool/xmlsectool/XmlSecTool.java
index 61cc36b..2efbdd2 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/XmlSecTool.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/XmlSecTool.java
@@ -130,7 +130,7 @@ public final class XmlSecTool {
             }
             
             if (cli.doListBlacklist()) {
-                listBlacklistCommand(cli.getBlacklist());
+                cli.getBlacklist().list(System.out);
                 return;
             }
 
@@ -161,32 +161,6 @@ public final class XmlSecTool {
     }
 
     /**
-     * Perform the --listBlacklist command.
-     * 
-     * @param blacklist blacklist to list
-     */
-    private static void listBlacklistCommand(final Blacklist blacklist) {
-        System.out.println("Digest algorithm blacklist:");
-        if (blacklist.getDigestBlacklist().isEmpty()) {
-            System.out.println("   blacklist is empty");
-        } else {
-            for (final String uri: blacklist.getDigestBlacklist()) {
-                System.out.println("   " + uri);
-            }
-        }
-        System.out.println();
-        System.out.println("Signature algorithm blacklist:");
-        if (blacklist.getSignatureBlacklist().isEmpty()) {
-            System.out.println("   blacklist is empty");
-        } else {
-            for (final String uri: blacklist.getSignatureBlacklist()) {
-                System.out.println("   " + uri);
-            }
-        }
-        System.out.println();
-    }
-
-    /**
      * Parses the input XML from its source and converts it to a DOM document.
      * 
      * @param cli command line arguments

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.