Using correct class to access static members (#188)

- Members were accessed using classes extending the real member owner
- Eclipse cleanup

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>

Author: dmatej

src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java

@@ -156,7 +156,7 @@ public void startElement(String uri, String localName, String qName, Attributes
                 DOMResult domResult = new DOMResult();
                 try {
                     XMLReader xmlReader = XMLReaderFactory.createXMLReader();
-                    SAXTransformerFactory saxTransformerFactory = (SAXTransformerFactory) SAXTransformerFactory.newInstance();
+                    SAXTransformerFactory saxTransformerFactory = (SAXTransformerFactory) TransformerFactory.newInstance();
                     saxTransformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
                     try {
                         saxTransformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");

src/main/java/org/apache/xml/security/stax/ext/OutboundXMLSec.java

@@ -29,8 +29,8 @@
 import javax.crypto.KeyGenerator;
 import javax.xml.stream.XMLStreamWriter;
 
+import org.apache.xml.security.algorithms.JCEMapper;
 import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
 import org.apache.xml.security.stax.impl.DocumentContextImpl;
 import org.apache.xml.security.stax.impl.OutboundSecurityContextImpl;
 import org.apache.xml.security.stax.impl.OutputProcessorChainImpl;
@@ -245,7 +245,7 @@ private void configureEncryptionKeys(final OutboundSecurityContextImpl outboundS
             }
             // If none is configured then generate one
             String keyAlgorithm =
-                JCEAlgorithmMapper.getJCEKeyAlgorithmFromURI(securityProperties.getEncryptionSymAlgorithm());
+                JCEMapper.getJCEKeyAlgorithmFromURI(securityProperties.getEncryptionSymAlgorithm());
             KeyGenerator keyGen;
             try {
                 keyGen = KeyGenerator.getInstance(keyAlgorithm);
@@ -256,7 +256,7 @@ private void configureEncryptionKeys(final OutboundSecurityContextImpl outboundS
             //whereas bouncy castle expects the block size of 128 or 192 bits
             if (keyAlgorithm.contains("AES")) {
                 int keyLength =
-                    JCEAlgorithmMapper.getKeyLengthFromURI(securityProperties.getEncryptionSymAlgorithm());
+                    JCEMapper.getKeyLengthFromURI(securityProperties.getEncryptionSymAlgorithm());
                 keyGen.init(keyLength);
             }
 

src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java

@@ -41,6 +41,7 @@
 import javax.crypto.spec.SecretKeySpec;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
@@ -104,25 +105,25 @@ public static String getXMLEventAsString(XMLSecEvent xmlSecEvent) {
         int eventType = xmlSecEvent.getEventType();
 
         switch (eventType) {
-            case XMLSecEvent.START_ELEMENT:
+            case XMLStreamConstants.START_ELEMENT:
                 return "START_ELEMENT";
-            case XMLSecEvent.END_ELEMENT:
+            case XMLStreamConstants.END_ELEMENT:
                 return "END_ELEMENT";
-            case XMLSecEvent.PROCESSING_INSTRUCTION:
+            case XMLStreamConstants.PROCESSING_INSTRUCTION:
                 return "PROCESSING_INSTRUCTION";
-            case XMLSecEvent.CHARACTERS:
+            case XMLStreamConstants.CHARACTERS:
                 return "CHARACTERS";
-            case XMLSecEvent.COMMENT:
+            case XMLStreamConstants.COMMENT:
                 return "COMMENT";
-            case XMLSecEvent.START_DOCUMENT:
+            case XMLStreamConstants.START_DOCUMENT:
                 return "START_DOCUMENT";
-            case XMLSecEvent.END_DOCUMENT:
+            case XMLStreamConstants.END_DOCUMENT:
                 return "END_DOCUMENT";
-            case XMLSecEvent.ATTRIBUTE:
+            case XMLStreamConstants.ATTRIBUTE:
                 return "ATTRIBUTE";
-            case XMLSecEvent.DTD:
+            case XMLStreamConstants.DTD:
                 return "DTD";
-            case XMLSecEvent.NAMESPACE:
+            case XMLStreamConstants.NAMESPACE:
                 return "NAMESPACE";
             default:
                 throw new IllegalArgumentException("Illegal XMLSecEvent received: " + eventType);

src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java

@@ -21,8 +21,8 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
+import org.apache.xml.security.algorithms.JCEMapper;
 import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
 
 /**
  */
@@ -41,13 +41,13 @@ public static synchronized SignatureAlgorithmFactory getInstance() {
     }
 
     public SignatureAlgorithm getSignatureAlgorithm(String algoURI) throws XMLSecurityException, NoSuchProviderException, NoSuchAlgorithmException {
-        String algorithmClass = JCEAlgorithmMapper.getAlgorithmClassFromURI(algoURI);
+        String algorithmClass = JCEMapper.getAlgorithmClassFromURI(algoURI);
         if (algorithmClass == null) {
             throw new XMLSecurityException("algorithms.NoSuchMap",
                                            new Object[] {algoURI});
         }
-        String jceName = JCEAlgorithmMapper.translateURItoJCEID(algoURI);
-        String jceProvider = JCEAlgorithmMapper.getJCEProviderFromURI(algoURI);
+        String jceName = JCEMapper.translateURItoJCEID(algoURI);
+        String jceProvider = JCEMapper.getJCEProviderFromURI(algoURI);
         if ("MAC".equalsIgnoreCase(algorithmClass)) {
             return new HMACSignatureAlgorithm(jceName, jceProvider);
         } else if ("Signature".equalsIgnoreCase(algorithmClass)) {

src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java

@@ -55,6 +55,7 @@
 import javax.xml.stream.events.Attribute;
 
 import org.apache.commons.codec.binary.Base64OutputStream;
+import org.apache.xml.security.algorithms.JCEMapper;
 import org.apache.xml.security.binding.xmldsig.KeyInfoType;
 import org.apache.xml.security.binding.xmlenc.EncryptedDataType;
 import org.apache.xml.security.binding.xmlenc.EncryptedKeyType;
@@ -63,7 +64,6 @@
 import org.apache.xml.security.binding.xop.Include;
 import org.apache.xml.security.exceptions.XMLSecurityException;
 import org.apache.xml.security.stax.config.ConfigurationProperties;
-import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
 import org.apache.xml.security.stax.ext.AbstractInputProcessor;
 import org.apache.xml.security.stax.ext.InboundSecurityContext;
 import org.apache.xml.security.stax.ext.InputProcessorChain;
@@ -234,7 +234,7 @@ private XMLSecEvent processEvent(InputProcessorChain inputProcessorChain, boolea
                 handleSecurityToken(inboundSecurityToken, inputProcessorChain.getSecurityContext(), encryptedDataType);
 
                 final String algorithmURI = encryptedDataType.getEncryptionMethod().getAlgorithm();
-                final int ivLength = JCEAlgorithmMapper.getIVLengthFromURI(algorithmURI) / 8;
+                final int ivLength = JCEMapper.getIVLengthFromURI(algorithmURI) / 8;
                 Cipher symCipher = getCipher(algorithmURI);
 
                 if (encryptedDataType.getCipherData().getCipherReference() != null) {
@@ -437,8 +437,8 @@ private void forwardToWrapperElement(XMLStreamReader xmlStreamReader) throws XML
     private Cipher getCipher(String algorithmURI) throws XMLSecurityException {
         Cipher symCipher;
         try {
-            String jceName = JCEAlgorithmMapper.translateURItoJCEID(algorithmURI);
-            String jceProvider = JCEAlgorithmMapper.getJCEProviderFromURI(algorithmURI);
+            String jceName = JCEMapper.translateURItoJCEID(algorithmURI);
+            String jceProvider = JCEMapper.getJCEProviderFromURI(algorithmURI);
             if (jceName == null) {
                 throw new XMLSecurityException("algorithms.NoSuchMap",
                                                new Object[] {algorithmURI});

src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java

@@ -37,13 +37,13 @@
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 
+import org.apache.xml.security.algorithms.JCEMapper;
 import org.apache.xml.security.binding.excc14n.InclusiveNamespaces;
 import org.apache.xml.security.binding.xmldsig.ReferenceType;
 import org.apache.xml.security.binding.xmldsig.SignatureType;
 import org.apache.xml.security.binding.xmldsig.TransformType;
 import org.apache.xml.security.exceptions.XMLSecurityException;
 import org.apache.xml.security.stax.config.ConfigurationProperties;
-import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
 import org.apache.xml.security.stax.config.ResourceResolverMapper;
 import org.apache.xml.security.stax.ext.AbstractInputProcessor;
 import org.apache.xml.security.stax.ext.InboundSecurityContext;
@@ -294,8 +294,8 @@ protected DigestOutputStream createMessageDigestOutputStream(ReferenceType refer
             throws XMLSecurityException {
 
         String digestMethodAlgorithm = referenceType.getDigestMethod().getAlgorithm();
-        String jceName = JCEAlgorithmMapper.translateURItoJCEID(digestMethodAlgorithm);
-        String jceProvider = JCEAlgorithmMapper.getJCEProviderFromURI(digestMethodAlgorithm);
+        String jceName = JCEMapper.translateURItoJCEID(digestMethodAlgorithm);
+        String jceProvider = JCEMapper.getJCEProviderFromURI(digestMethodAlgorithm);
         if (jceName == null) {
             throw new XMLSecurityException("algorithms.NoSuchMap",
                                            new Object[] {digestMethodAlgorithm});

src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java

@@ -36,14 +36,14 @@
 import javax.crypto.spec.PSource;
 import javax.crypto.spec.SecretKeySpec;
 
+import org.apache.xml.security.algorithms.JCEMapper;
 import org.apache.xml.security.binding.xmldsig.DigestMethodType;
 import org.apache.xml.security.binding.xmldsig.KeyInfoType;
 import org.apache.xml.security.binding.xmlenc.CipherValueType;
 import org.apache.xml.security.binding.xmlenc.EncryptedKeyType;
 import org.apache.xml.security.binding.xmlenc11.MGFType;
 import org.apache.xml.security.binding.xop.Include;
 import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
 import org.apache.xml.security.stax.ext.AbstractInputSecurityHeaderHandler;
 import org.apache.xml.security.stax.ext.InboundSecurityContext;
 import org.apache.xml.security.stax.ext.InputProcessorChain;
@@ -124,7 +124,7 @@ public Key getKey(String algorithmURI, XMLSecurityConstants.AlgorithmUsage algor
                             return key;
                         }
 
-                        String algoFamily = JCEAlgorithmMapper.getJCEKeyAlgorithmFromURI(algorithmURI);
+                        String algoFamily = JCEMapper.getJCEKeyAlgorithmFromURI(algorithmURI);
                         key = new SecretKeySpec(getSecret(this, correlationID, algorithmURI), algoFamily);
                         setSecretKey(algorithmURI, key);
                         return key;
@@ -170,8 +170,8 @@ private byte[] getSecret(InboundSecurityToken wrappedSecurityToken, String corre
                         if (algorithmURI == null) {
                             throw new XMLSecurityException("stax.encryption.noEncAlgo");
                         }
-                        String jceName = JCEAlgorithmMapper.translateURItoJCEID(algorithmURI);
-                        String jceProvider = JCEAlgorithmMapper.getJCEProviderFromURI(algorithmURI);
+                        String jceName = JCEMapper.translateURItoJCEID(algorithmURI);
+                        String jceProvider = JCEMapper.getJCEProviderFromURI(algorithmURI);
                         if (jceName == null) {
                             throw new XMLSecurityException("algorithms.NoSuchMap",
                                                            new Object[] {algorithmURI});
@@ -206,7 +206,7 @@ private byte[] getSecret(InboundSecurityToken wrappedSecurityToken, String corre
                                     algorithmSuiteSecurityEvent.setCorrelationID(correlationID);
                                     inboundSecurityContext.registerSecurityEvent(algorithmSuiteSecurityEvent);
 
-                                    jceDigestAlgorithm = JCEAlgorithmMapper.translateURItoJCEID(digestMethodType.getAlgorithm());
+                                    jceDigestAlgorithm = JCEMapper.translateURItoJCEID(digestMethodType.getAlgorithm());
                                 }
 
                                 PSource.PSpecified pSource = PSource.PSpecified.DEFAULT;
@@ -220,7 +220,7 @@ private byte[] getSecret(InboundSecurityToken wrappedSecurityToken, String corre
                                 final MGFType mgfType =
                                         XMLSecurityUtils.getQNameType(encryptedKeyType.getEncryptionMethod().getContent(), XMLSecurityConstants.TAG_xenc11_MGF);
                                 if (mgfType != null) {
-                                    String jceMGFAlgorithm = JCEAlgorithmMapper.translateURItoJCEID(mgfType.getAlgorithm());
+                                    String jceMGFAlgorithm = JCEMapper.translateURItoJCEID(mgfType.getAlgorithm());
                                     mgfParameterSpec = new MGF1ParameterSpec(jceMGFAlgorithm);
                                 }
                                 OAEPParameterSpec oaepParameterSpec = new OAEPParameterSpec(jceDigestAlgorithm, "MGF1", mgfParameterSpec, pSource);
@@ -255,7 +255,7 @@ private byte[] getSecret(InboundSecurityToken wrappedSecurityToken, String corre
                             LOG.warn("Unwrapping of the encrypted key failed with error: " + e.getMessage() + ". " +
                                     "Generating a faked one to mitigate timing attacks.");
 
-                            int keyLength = JCEAlgorithmMapper.getKeyLengthFromURI(symmetricAlgorithmURI);
+                            int keyLength = JCEMapper.getKeyLengthFromURI(symmetricAlgorithmURI);
                             this.decryptedKey = XMLSecurityConstants.generateBytes(keyLength / 8);
                             return this.decryptedKey;
                         }

src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java

@@ -37,8 +37,8 @@
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 
+import org.apache.xml.security.algorithms.JCEMapper;
 import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
 import org.apache.xml.security.stax.ext.OutputProcessorChain;
 import org.apache.xml.security.stax.ext.SecurePart;
 import org.apache.xml.security.stax.ext.XMLSecurityConstants;
@@ -189,7 +189,7 @@ protected void createKeyInfoStructure(OutputProcessorChain outputProcessorChain)
                         createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_xenc_CipherValue, false, null);
 
                         //encrypt the symmetric session key with the public key from the receiver:
-                        String jceid = JCEAlgorithmMapper.translateURItoJCEID(encryptionKeyTransportAlgorithm);
+                        String jceid = JCEMapper.translateURItoJCEID(encryptionKeyTransportAlgorithm);
                         if (jceid == null) {
                             throw new XMLSecurityException("algorithms.NoSuchMap",
                                                            new Object[] {encryptionKeyTransportAlgorithm});
@@ -204,7 +204,7 @@ protected void createKeyInfoStructure(OutputProcessorChain outputProcessorChain)
 
                                 String jceDigestAlgorithm = "SHA-1";
                                 if (encryptionKeyTransportDigestAlgorithm != null) {
-                                    jceDigestAlgorithm = JCEAlgorithmMapper.translateURItoJCEID(encryptionKeyTransportDigestAlgorithm);
+                                    jceDigestAlgorithm = JCEMapper.translateURItoJCEID(encryptionKeyTransportDigestAlgorithm);
                                 }
 
                                 PSource.PSpecified pSource = PSource.PSpecified.DEFAULT;
@@ -215,7 +215,7 @@ protected void createKeyInfoStructure(OutputProcessorChain outputProcessorChain)
 
                                 MGF1ParameterSpec mgfParameterSpec = new MGF1ParameterSpec("SHA-1");
                                 if (encryptionKeyTransportMGFAlgorithm != null) {
-                                    String jceMGFAlgorithm = JCEAlgorithmMapper.translateURItoJCEID(encryptionKeyTransportMGFAlgorithm);
+                                    String jceMGFAlgorithm = JCEMapper.translateURItoJCEID(encryptionKeyTransportMGFAlgorithm);
                                     mgfParameterSpec = new MGF1ParameterSpec(jceMGFAlgorithm);
                                 }
                                 algorithmParameterSpec = new OAEPParameterSpec(jceDigestAlgorithm, "MGF1", mgfParameterSpec, pSource);