More refactoring

git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-java/trunk@1877725 13f79535-47bb-0310-9956-ffa450edef68

Author: coheigea

src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java

@@ -114,9 +114,7 @@ public PublicKey getPublicKey() throws XMLSecurityException {
             PublicKey pk = dsaFactory.generatePublic(pkspec);
 
             return pk;
-        } catch (NoSuchAlgorithmException ex) {
-            throw new XMLSecurityException(ex);
-        } catch (InvalidKeySpecException ex) {
+        } catch (NoSuchAlgorithmException | InvalidKeySpecException ex) {
             throw new XMLSecurityException(ex);
         }
     }

src/main/java/org/apache/xml/security/keys/content/keyvalues/ECKeyValue.java

@@ -200,11 +200,7 @@ public PublicKey getPublicKey() throws XMLSecurityException {
 
             ECPublicKeySpec spec = new ECPublicKeySpec(ecPoint, ecParams);
             return KeyFactory.getInstance("EC").generatePublic(spec);
-        } catch (NoSuchAlgorithmException ex) {
-            throw new XMLSecurityException(ex);
-        } catch (InvalidKeySpecException ex) {
-            throw new XMLSecurityException(ex);
-        } catch (MarshalException ex) {
+        } catch (NoSuchAlgorithmException | InvalidKeySpecException | MarshalException ex) {
             throw new XMLSecurityException(ex);
         }
     }

src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java

@@ -105,9 +105,7 @@ public PublicKey getPublicKey() throws XMLSecurityException {
             PublicKey pk = rsaFactory.generatePublic(rsaKeyspec);
 
             return pk;
-        } catch (NoSuchAlgorithmException ex) {
-            throw new XMLSecurityException(ex);
-        } catch (InvalidKeySpecException ex) {
+        } catch (NoSuchAlgorithmException | InvalidKeySpecException ex) {
             throw new XMLSecurityException(ex);
         }
     }

src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java

@@ -115,7 +115,7 @@ private boolean needsCircumvent(String str) {
         return str.indexOf("namespace") != -1 || str.indexOf("name()") != -1;
     }
 
-    static class XPathNodeFilter implements NodeFilter {
+    private static class XPathNodeFilter implements NodeFilter {
 
         private final XPathAPI xPathAPI;
         private final Node xpathnode;

src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java

@@ -235,9 +235,7 @@ private static URI getNewURI(String uri, String baseURI) throws URISyntaxExcepti
 
         // if the URI contains a fragment, ignore it
         if (newUri.getFragment() != null) {
-            URI uriNewNoFrag =
-                new URI(newUri.getScheme(), newUri.getSchemeSpecificPart(), null);
-            return uriNewNoFrag;
+            return new URI(newUri.getScheme(), newUri.getSchemeSpecificPart(), null);
         }
         return newUri;
     }

src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java

@@ -137,9 +137,7 @@ private static URI getNewURI(String uri, String baseURI) throws URISyntaxExcepti
 
         // if the URI contains a fragment, ignore it
         if (newUri.getFragment() != null) {
-            URI uriNewNoFrag =
-                new URI(newUri.getScheme(), newUri.getSchemeSpecificPart(), null);
-            return uriNewNoFrag;
+            return new URI(newUri.getScheme(), newUri.getSchemeSpecificPart(), null);
         }
         return newUri;
     }

src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java

@@ -25,13 +25,15 @@
 import java.security.Security;
 
 import org.apache.xml.security.algorithms.MessageDigestAlgorithm;
+import org.apache.xml.security.signature.XMLSignatureException;
 import org.apache.xml.security.test.dom.TestUtils;
 import org.junit.jupiter.api.Assumptions;
 import org.w3c.dom.Document;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
@@ -294,4 +296,15 @@ public void testSHA3_512() throws Exception {
         assertArrayEquals(digest, digest2);
     }
 
+    @org.junit.jupiter.api.Test
+    public void testNullAlgorithm() throws Exception {
+        assertThrows(XMLSignatureException.class, () ->
+                MessageDigestAlgorithm.getInstance(TestUtils.newDocument(), null));
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testNoSuchAlgorithm() throws Exception {
+        assertThrows(XMLSignatureException.class, () ->
+                MessageDigestAlgorithm.getInstance(TestUtils.newDocument(), "xyz"));
+    }
 }

src/test/java/org/apache/xml/security/test/dom/algorithms/SignatureAlgorithmTest.java

@@ -34,6 +34,8 @@
 import javax.crypto.SecretKey;
 
 import org.apache.xml.security.algorithms.SignatureAlgorithm;
+import org.apache.xml.security.algorithms.implementations.SignatureBaseRSA;
+import org.apache.xml.security.exceptions.AlgorithmAlreadyRegisteredException;
 import org.apache.xml.security.exceptions.XMLSecurityException;
 import org.apache.xml.security.signature.XMLSignature;
 import org.apache.xml.security.signature.XMLSignatureException;
@@ -194,4 +196,20 @@ public void testHMACVerifyingKeyIsSecretKey() throws Exception {
         assertThrows(XMLSignatureException.class, () ->
                 signatureAlgorithm.initVerify(keyPair.getPublic()));
     }
+
+    @org.junit.jupiter.api.Test
+    public void testAlreadyRegisteredException() throws Exception {
+        assertThrows(AlgorithmAlreadyRegisteredException.class, () ->
+            SignatureAlgorithm.register(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256,
+                    SignatureBaseRSA.SignatureRSASHA256.class)
+        );
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testAlreadyRegisteredExceptionFromString() throws Exception {
+        assertThrows(AlgorithmAlreadyRegisteredException.class, () ->
+                SignatureAlgorithm.register(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256,
+                        SignatureBaseRSA.SignatureRSASHA256.class.getName())
+        );
+    }
 }

src/test/java/org/apache/xml/security/test/dom/transforms/TransformTest.java

@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.xml.security.test.dom.transforms;
+
+import org.apache.xml.security.Init;
+import org.apache.xml.security.exceptions.AlgorithmAlreadyRegisteredException;
+import org.apache.xml.security.transforms.Transform;
+import org.apache.xml.security.transforms.Transforms;
+import org.apache.xml.security.transforms.implementations.TransformC14N11;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class TransformTest {
+
+    static {
+        Init.init();
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testAlreadyRegisteredException() throws Exception {
+        assertThrows(AlgorithmAlreadyRegisteredException.class, () ->
+                Transform.register(Transforms.TRANSFORM_C14N11_OMIT_COMMENTS, TransformC14N11.class)
+        );
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testAlreadyRegisteredExceptionFromString() throws Exception {
+        assertThrows(AlgorithmAlreadyRegisteredException.class, () ->
+                Transform.register(Transforms.TRANSFORM_C14N11_OMIT_COMMENTS,
+                        TransformC14N11.class.getName())
+        );
+    }
+}