Remove unnecessary "= null" declarations

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

src/main/java/org/apache/xml/security/algorithms/JCEMapper.java

@@ -38,7 +38,7 @@ public class JCEMapper {
     private static Map<String, Algorithm> algorithmsMap =
         new ConcurrentHashMap<String, Algorithm>();
 
-    private static String providerName = null;
+    private static String providerName;
 
     /**
      * Method register

src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java

@@ -44,7 +44,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
         org.slf4j.LoggerFactory.getLogger(IntegrityHmac.class);
 
     /** Field macAlgorithm */
-    private Mac macAlgorithm = null;
+    private Mac macAlgorithm;
 
     /** Field HMACOutputLength */
     private int HMACOutputLength = 0;

src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java

@@ -43,7 +43,7 @@ public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
     public abstract String engineGetURI();
 
     /** Field algorithm */
-    private Signature signatureAlgorithm = null;
+    private Signature signatureAlgorithm;
 
     /**
      * Constructor SignatureRSA

src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java

@@ -46,7 +46,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
         org.slf4j.LoggerFactory.getLogger(SignatureDSA.class);
 
     /** Field algorithm */
-    private Signature signatureAlgorithm = null;
+    private Signature signatureAlgorithm;
 
     /** size of Q */
     private int size;

src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java

@@ -50,7 +50,7 @@ public abstract class SignatureECDSA extends SignatureAlgorithmSpi {
     public abstract String engineGetURI();
 
     /** Field algorithm */
-    private Signature signatureAlgorithm = null;
+    private Signature signatureAlgorithm;
 
     /**
      * Converts an ASN.1 ECDSA value to a XML Signature ECDSA Value.

src/main/java/org/apache/xml/security/encryption/XMLCipher.java

@@ -250,10 +250,10 @@ public class XMLCipher {
     private int cipherMode = Integer.MIN_VALUE;
 
     /** URI of algorithm that is being used for cryptographic operation */
-    private String algorithm = null;
+    private String algorithm;
 
     /** Cryptographic provider requested by caller */
-    private String requestedJCEProvider = null;
+    private String requestedJCEProvider;
 
     /** Holds c14n to serialize, if initialized then _always_ use this c14n to serialize */
     private Canonicalizer canon;
@@ -2588,11 +2588,11 @@ Element toElement(ReferenceList referenceList) {
         }
 
         private class AgreementMethodImpl implements AgreementMethod {
-            private byte[] kaNonce = null;
-            private List<Element> agreementMethodInformation = null;
-            private KeyInfo originatorKeyInfo = null;
-            private KeyInfo recipientKeyInfo = null;
-            private String algorithmURI = null;
+            private byte[] kaNonce;
+            private List<Element> agreementMethodInformation;
+            private KeyInfo originatorKeyInfo;
+            private KeyInfo recipientKeyInfo;
+            private String algorithmURI;
 
             /**
              * @param algorithm
@@ -2665,8 +2665,8 @@ private class CipherDataImpl implements CipherData {
                 "Data type is reference type.";
             private static final String referenceMessage =
                 "Data type is value type.";
-            private CipherValue cipherValue = null;
-            private CipherReference cipherReference = null;
+            private CipherValue cipherValue;
+            private CipherReference cipherReference;
             private int cipherType = Integer.MIN_VALUE;
 
             /**
@@ -2729,9 +2729,9 @@ Element toElement() {
         }
 
         private class CipherReferenceImpl implements CipherReference {
-            private String referenceURI = null;
-            private Transforms referenceTransforms = null;
-            private Attr referenceNode = null;
+            private String referenceURI;
+            private Transforms referenceTransforms;
+            private Attr referenceNode;
 
             /**
              * @param uri
@@ -2785,7 +2785,7 @@ Element toElement() {
         }
 
         private class CipherValueImpl implements CipherValue {
-            private String cipherValue = null;
+            private String cipherValue;
 
             /**
              * @param value
@@ -2867,9 +2867,9 @@ Element toElement() {
         }
 
         private class EncryptedKeyImpl extends EncryptedTypeImpl implements EncryptedKey {
-            private String keyRecipient = null;
-            private ReferenceList referenceList = null;
-            private String carriedName = null;
+            private String keyRecipient;
+            private ReferenceList referenceList;
+            private String carriedName;
 
             /**
              * @param data
@@ -2966,14 +2966,14 @@ null, EncryptionConstants._ATT_RECIPIENT, getRecipient()
         }
 
         private abstract class EncryptedTypeImpl {
-            private String id =  null;
-            private String type = null;
-            private String mimeType = null;
-            private String encoding = null;
-            private EncryptionMethod encryptionMethod = null;
-            private KeyInfo keyInfo = null;
-            private CipherData cipherData = null;
-            private EncryptionProperties encryptionProperties = null;
+            private String id;
+            private String type;
+            private String mimeType;
+            private String encoding;
+            private EncryptionMethod encryptionMethod;
+            private KeyInfo keyInfo;
+            private CipherData cipherData;
+            private EncryptionProperties encryptionProperties;
 
             /**
              * Constructor.
@@ -3126,12 +3126,12 @@ public void setEncryptionProperties(EncryptionProperties properties) {
         }
 
         private class EncryptionMethodImpl implements EncryptionMethod {
-            private String algorithm = null;
+            private String algorithm;
             private int keySize = Integer.MIN_VALUE;
-            private byte[] oaepParams = null;
-            private List<Element> encryptionMethodInformation = null;
-            private String digestAlgorithm = null;
-            private String mgfAlgorithm = null;
+            private byte[] oaepParams;
+            private List<Element> encryptionMethodInformation;
+            private String digestAlgorithm;
+            private String mgfAlgorithm;
 
             /**
              * Constructor.
@@ -3264,8 +3264,8 @@ Element toElement() {
         }
 
         private class EncryptionPropertiesImpl implements EncryptionProperties {
-            private String id = null;
-            private List<EncryptionProperty> encryptionProperties = null;
+            private String id;
+            private List<EncryptionProperty> encryptionProperties;
 
             /**
              * Constructor.
@@ -3317,10 +3317,10 @@ Element toElement() {
         }
 
         private class EncryptionPropertyImpl implements EncryptionProperty {
-            private String target = null;
-            private String id = null;
+            private String target;
+            private String id;
             private Map<String, String> attributeMap = new HashMap<String, String>();
-            private List<Element> encryptionInformation = null;
+            private List<Element> encryptionInformation;
 
             /**
              * Constructor.

src/main/java/org/apache/xml/security/keys/KeyInfo.java

@@ -97,8 +97,8 @@ public class KeyInfo extends SignatureElementProxy {
     // the KeyResolvers would not be called.
     // The default StorageResolver is null.
 
-    private List<X509Data> x509Datas = null;
-    private List<EncryptedKey> encryptedKeys = null;
+    private List<X509Data> x509Datas;
+    private List<EncryptedKey> encryptedKeys;
 
     private static final List<StorageResolver> nullList;
     static {

src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java

@@ -49,7 +49,7 @@
 public abstract class KeyResolverSpi {
 
     /** Field properties */
-    protected java.util.Map<String, String> properties = null;
+    protected java.util.Map<String, String> properties;
 
     protected boolean globalResolver = false;
 

src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java

@@ -38,7 +38,7 @@ public class StorageResolver {
         org.slf4j.LoggerFactory.getLogger(StorageResolver.class);
 
     /** Field storageResolvers */
-    private List<StorageResolverSpi> storageResolvers = null;
+    private List<StorageResolverSpi> storageResolvers;
 
     /**
      * Constructor StorageResolver

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

@@ -49,7 +49,7 @@ public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
         );
 
     /** Field merlinsCertificatesDir */
-    private String merlinsCertificatesDir = null;
+    private String merlinsCertificatesDir;
 
     /** Field certs */
     private List<X509Certificate> certs = new ArrayList<>();
@@ -149,7 +149,7 @@ public Iterator<Certificate> getIterator() {
     private static class FilesystemIterator implements Iterator<Certificate> {
 
         /** Field certs */
-        private List<X509Certificate> certs = null;
+        private List<X509Certificate> certs;
 
         /** Field i */
         private int i;

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

@@ -35,7 +35,7 @@
 public class KeyStoreResolver extends StorageResolverSpi {
 
     /** Field keyStore */
-    private KeyStore keyStore = null;
+    private KeyStore keyStore;
 
     /**
      * Constructor KeyStoreResolver

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

@@ -32,7 +32,7 @@
 public class SingleCertificateResolver extends StorageResolverSpi {
 
     /** Field certificate */
-    private X509Certificate certificate = null;
+    private X509Certificate certificate;
 
     /**
      * @param x509cert the single {@link X509Certificate}

src/main/java/org/apache/xml/security/signature/Manifest.java

@@ -64,13 +64,13 @@ public class Manifest extends SignatureElementProxy {
     private Element[] referencesEl;
 
     /** Field verificationResults[] */
-    private boolean[] verificationResults = null;
+    private boolean[] verificationResults;
 
     /** Field resolverProperties */
-    private Map<String, String> resolverProperties = null;
+    private Map<String, String> resolverProperties;
 
     /** Field perManifestResolvers */
-    private List<ResourceResolver> perManifestResolvers = null;
+    private List<ResourceResolver> perManifestResolvers;
 
     private boolean secureValidation;
 

src/main/java/org/apache/xml/security/signature/MissingResourceFailureException.java

@@ -34,7 +34,7 @@ public class MissingResourceFailureException extends XMLSignatureException {
     private static final long serialVersionUID = 1L;
 
     /** Field uninitializedReference */
-    private Reference uninitializedReference = null;
+    private Reference uninitializedReference;
 
     /**
      * MissingKeyResourceFailureException constructor.

src/main/java/org/apache/xml/security/signature/SignedInfo.java

@@ -50,10 +50,10 @@
 public class SignedInfo extends Manifest {
 
     /** Field signatureAlgorithm */
-    private SignatureAlgorithm signatureAlgorithm = null;
+    private SignatureAlgorithm signatureAlgorithm;
 
     /** Field c14nizedBytes           */
-    private byte[] c14nizedBytes = null;
+    private byte[] c14nizedBytes;
 
     private Element c14nMethod;
     private Element signatureMethod;

src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java

@@ -62,19 +62,19 @@ public class XMLSignatureInput {
      * Some InputStreams do not support the {@link java.io.InputStream#reset}
      * method, so we read it in completely and work on our Proxy.
      */
-    private InputStream inputOctetStreamProxy = null;
+    private InputStream inputOctetStreamProxy;
     /**
      * The original NodeSet for this XMLSignatureInput
      */
-    private Set<Node> inputNodeSet = null;
+    private Set<Node> inputNodeSet;
     /**
      * The original Element
      */
-    private Node subNode = null;
+    private Node subNode;
     /**
      * Exclude Node *for enveloped transformations*
      */
-    private Node excludeNode = null;
+    private Node excludeNode;
     /**
      *
      */
@@ -84,7 +84,7 @@ public class XMLSignatureInput {
     /**
      * A cached bytes
      */
-    private byte[] bytes = null;
+    private byte[] bytes;
     private boolean secureValidation;
 
     /**
@@ -96,20 +96,20 @@ public class XMLSignatureInput {
      * Transform algorithm and should be described in the specification for the
      * algorithm.
      */
-    private String mimeType = null;
+    private String mimeType;
 
     /**
      * Field sourceURI
      */
-    private String sourceURI = null;
+    private String sourceURI;
 
     /**
      * Node Filter list.
      */
     private List<NodeFilter> nodeFilters = new ArrayList<>();
 
     private boolean needsToBeExpanded = false;
-    private OutputStream outputStream = null;
+    private OutputStream outputStream;
 
     /**
      * Pre-calculated digest value of the object in base64.

src/main/java/org/apache/xml/security/signature/XMLSignatureInputDebugger.java

@@ -45,7 +45,7 @@ public class XMLSignatureInputDebugger {
     private Set<String> inclusiveNamespaces;
 
     /** Field writer */
-    private Writer writer = null;
+    private Writer writer;
 
     /** The HTML Prefix* */
     static final String HTMLPrefix =

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

@@ -47,7 +47,7 @@
  */
 public class Init {
 
-    private static URI initialized = null;
+    private static URI initialized;
 
     @SuppressWarnings("unchecked")
     public static synchronized void init(URI uri, Class<?> callingClass) throws XMLSecurityException {

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

@@ -67,7 +67,7 @@ public class XIncludeHandler extends DefaultHandler {
     private static final String xIncludeNS = "http://www.w3.org/2001/XInclude";
     private static final String xIncludeLN = "include";
     private final ContentHandler contentHandler;
-    private URL systemId = null;
+    private URL systemId;
     private boolean skipEvents = false;
 
     Map<URI, Document> uriDocMap = new HashMap<URI, Document>();

src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java

@@ -46,8 +46,8 @@
 public class XMLSecurityStreamWriter implements XMLStreamWriter {
 
     private final OutputProcessorChain outputProcessorChain;
-    private Element elementStack = null;
-    private Element openStartElement = null;
+    private Element elementStack;
+    private Element openStartElement;
     private NSContext namespaceContext = new NSContext(null);
     private boolean endDocumentWritten = false;
     private boolean haveToWriteEndElement = false;

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

@@ -30,7 +30,7 @@
  */
 public class SignatureAlgorithmFactory {
 
-    private static SignatureAlgorithmFactory instance = null;
+    private static SignatureAlgorithmFactory instance;
 
     private SignatureAlgorithmFactory() {
     }