More refactor of utils.resolver / keys

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

Author: coheigea

src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java

@@ -116,9 +116,7 @@ public PublicKey getPublicKey() throws XMLSecurityException {
                 if (publicKey != null) {
                     return publicKey;
                 }
-            } catch (NoSuchAlgorithmException e) { //NOPMD
-                // Do nothing, try the next type
-            } catch (InvalidKeySpecException e) { //NOPMD
+            } catch (NoSuchAlgorithmException | InvalidKeySpecException e) { //NOPMD
                 // Do nothing, try the next type
             }
         }
@@ -136,10 +134,7 @@ protected byte[] getEncodedDER(PublicKey publicKey) throws XMLSecurityException
             KeyFactory keyFactory = KeyFactory.getInstance(publicKey.getAlgorithm());
             X509EncodedKeySpec keySpec = keyFactory.getKeySpec(publicKey, X509EncodedKeySpec.class);
             return keySpec.getEncoded();
-        } catch (NoSuchAlgorithmException e) {
-            Object[] exArgs = { publicKey.getAlgorithm(), publicKey.getFormat(), publicKey.getClass().getName() };
-            throw new XMLSecurityException(e, "DEREncodedKeyValue.UnsupportedPublicKey", exArgs);
-        } catch (InvalidKeySpecException e) {
+        } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
             Object[] exArgs = { publicKey.getAlgorithm(), publicKey.getFormat(), publicKey.getClass().getName() };
             throw new XMLSecurityException(e, "DEREncodedKeyValue.UnsupportedPublicKey", exArgs);
         }

src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java

@@ -22,7 +22,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.InetSocketAddress;
-import java.net.MalformedURLException;
 import java.net.Proxy;
 import java.net.URISyntaxException;
 import java.net.URI;
@@ -157,14 +156,8 @@ public XMLSignatureInput engineResolveURI(ResourceResolverContext context)
                 return result;
             }
 
-        } catch (URISyntaxException ex) {
+        } catch (URISyntaxException | IOException | IllegalArgumentException ex) {
             throw new ResourceResolverException(ex, context.uriToResolve, context.baseUri, "generic.EmptyMessage");
-        } catch (MalformedURLException ex) {
-            throw new ResourceResolverException(ex, context.uriToResolve, context.baseUri, "generic.EmptyMessage");
-        } catch (IOException ex) {
-            throw new ResourceResolverException(ex, context.uriToResolve, context.baseUri, "generic.EmptyMessage");
-        } catch (IllegalArgumentException e) {
-            throw new ResourceResolverException(e, context.uriToResolve, context.baseUri, "generic.EmptyMessage");
         }
     }
 

src/main/java/org/apache/xml/security/stax/impl/util/LimitingInputStream.java

@@ -101,9 +101,6 @@ public XMLSignatureInput engineResolveURI(ResourceResolverContext context)
      * {@inheritDoc}
      */
     public boolean engineCanResolveURI(ResourceResolverContext context) {
-        if (context.uriToResolve == null) {
-            return false;
-        }
         return isXPointerSlash(context.uriToResolve) || isXPointerId(context.uriToResolve);
     }
 
@@ -124,7 +121,7 @@ private static boolean isXPointerSlash(String uri) {
      * @return whether it has an xpointer id
      */
     private static boolean isXPointerId(String uri) {
-        if (uri.startsWith(XP) && uri.endsWith("))")) {
+        if (uri != null && uri.startsWith(XP) && uri.endsWith("))")) {
             String idPlusDelim = uri.substring(XP_LENGTH, uri.length() - 2);
 
             int idLen = idPlusDelim.length() -1;