code cleanup (imports,javadoc,header)

Author: uwemaurer

src/main/java/org/kopi/ebics/certificate/CertificateManager.java

@@ -14,7 +14,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * $Id$
  */
 
 package org.kopi.ebics.certificate;
@@ -39,7 +38,6 @@
 /**
  * Simple manager for EBICS certificates.
  *
- * @author hacheni
  *
  */
 public class CertificateManager {

src/main/java/org/kopi/ebics/certificate/KeyStoreManager.java

@@ -14,7 +14,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * $Id$
  */
 
 package org.kopi.ebics.certificate;
@@ -50,7 +49,6 @@
  * for a given alias.
  * The PKCS12 key store type is recommended to be used
  *
- * @author hachani
  *
  */
 public class KeyStoreManager {

src/main/java/org/kopi/ebics/certificate/KeyUtil.java

@@ -14,12 +14,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * $Id$
  */
 
 package org.kopi.ebics.certificate;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.KeyPair;
@@ -29,18 +27,16 @@
 import java.security.SecureRandom;
 import java.security.interfaces.RSAPublicKey;
 
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.Hex;
 import org.kopi.ebics.exception.EbicsException;
 import org.kopi.ebics.utils.Utils;
 
 /**
  * Some key utilities
  *
- * @author hachani
  *
  */
-public class KeyUtil {
+public final class KeyUtil {
 
     private KeyUtil() {
     }

src/main/java/org/kopi/ebics/certificate/X509Constants.java

@@ -14,25 +14,23 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * $Id$
  */
 
 package org.kopi.ebics.certificate;
 
 /**
  * X509 certificate constants
  *
- * @author hachani
  *
  */
 public interface X509Constants {
 
   /**
    * Certificates key usage
    */
-  int			SIGNATURE_KEY_USAGE			= 1;
-  int			AUTHENTICATION_KEY_USAGE		= 2;
-  int			ENCRYPTION_KEY_USAGE			= 3;
+  enum CertificateKeyUsage {
+      SIGNATURE_KEY_USAGE, AUTHENTICATION_KEY_USAGE, ENCRYPTION_KEY_USAGE,
+  }
 
   /**
    * Certificate signature algorithm

src/main/java/org/kopi/ebics/certificate/X509Generator.java

@@ -14,14 +14,11 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * $Id$
  */
 
 package org.kopi.ebics.certificate;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.math.BigInteger;
 import java.security.GeneralSecurityException;
 import java.security.KeyPair;
@@ -31,10 +28,6 @@
 import java.util.Date;
 import java.util.TimeZone;
 
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
 import org.bouncycastle.asn1.x509.BasicConstraints;
@@ -46,16 +39,15 @@
 import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509Name;
 import org.bouncycastle.jce.X509Principal;
 import org.bouncycastle.x509.X509V3CertificateGenerator;
+import org.kopi.ebics.certificate.X509Constants.CertificateKeyUsage;
 import org.kopi.ebics.utils.Utils;
 
 /**
  * An X509 certificate generator for EBICS protocol.
  * Generated certificates are self signed certificates.
  *
- * @author hachani
  *
  */
 @SuppressWarnings("deprecation")
@@ -81,7 +73,7 @@ public X509Certificate generateA005Certificate(KeyPair keypair,
 	            issuer,
 	            notBefore,
 	            notAfter,
-	            X509Constants.SIGNATURE_KEY_USAGE);
+                CertificateKeyUsage.SIGNATURE_KEY_USAGE);
   }
 
   /**
@@ -104,7 +96,7 @@ public X509Certificate generateX002Certificate(KeyPair keypair,
                     issuer,
                     notBefore,
                     notAfter,
-                    X509Constants.AUTHENTICATION_KEY_USAGE);
+                    CertificateKeyUsage.AUTHENTICATION_KEY_USAGE);
   }
 
   /**
@@ -127,7 +119,7 @@ public X509Certificate generateE002Certificate(KeyPair keypair,
                     issuer,
                     notBefore,
                     notAfter,
-                    X509Constants.ENCRYPTION_KEY_USAGE);
+                    CertificateKeyUsage.ENCRYPTION_KEY_USAGE);
   }
 
   /**
@@ -146,14 +138,15 @@ public X509Certificate generate(KeyPair keypair,
                                   String issuer,
       				  Date notBefore,
       				  Date notAfter,
-      				  int keyusage)
+      CertificateKeyUsage keyusage)
     throws GeneralSecurityException, IOException
   {
     X509V3CertificateGenerator		generator;
     BigInteger				serial;
     X509Certificate			certificate;
 
     serial = BigInteger.valueOf(generateSerial());
+
     generator = new X509V3CertificateGenerator();
     generator.setSerialNumber(serial);
     generator.setIssuerDN(new X509Principal(issuer));
@@ -180,13 +173,13 @@ public X509Certificate generate(KeyPair keypair,
       generator.addExtension(X509Extensions.ExtendedKeyUsage, false, new ExtendedKeyUsage(purposeIds));
 
     switch (keyusage) {
-    case X509Constants.SIGNATURE_KEY_USAGE:
+    case SIGNATURE_KEY_USAGE:
       generator.addExtension(X509Extensions.KeyUsage, false, new KeyUsage(KeyUsage.nonRepudiation));
       break;
-    case X509Constants.AUTHENTICATION_KEY_USAGE:
+    case AUTHENTICATION_KEY_USAGE:
       generator.addExtension(X509Extensions.KeyUsage, false, new KeyUsage(KeyUsage.digitalSignature));
       break;
-    case X509Constants.ENCRYPTION_KEY_USAGE:
+    case ENCRYPTION_KEY_USAGE:
       generator.addExtension(X509Extensions.KeyUsage, false, new KeyUsage(KeyUsage.keyAgreement));
       break;
     default:

src/main/java/org/kopi/ebics/client/Bank.java

@@ -14,7 +14,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * $Id$
  */
 
 package org.kopi.ebics.client;
@@ -34,7 +33,6 @@
  * This object is serializable to facilitate persisting of the values.
  * Save the object whenever it needs to be saved.
  *
- * @author Hachani
  *
  */
 public class Bank implements EbicsBank, Savable {

src/main/java/org/kopi/ebics/client/EbicsClient.java

@@ -14,7 +14,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * $Id$
  */
 
 package org.kopi.ebics.client;
@@ -26,6 +25,7 @@
 import java.io.ObjectInputStream;
 import java.net.URL;
 import java.security.GeneralSecurityException;
+import java.security.Security;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -40,6 +40,7 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.help.HelpFormatter;
+import org.apache.xml.security.Init;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.kopi.ebics.exception.EbicsException;
 import org.kopi.ebics.exception.NoDownloadDataAvailableException;
@@ -83,8 +84,8 @@ private static File getRootDir() {
     private User defaultUser;
 
     static {
-        org.apache.xml.security.Init.init();
-        java.security.Security.addProvider(new BouncyCastleProvider());
+        Init.init();
+        Security.addProvider(new BouncyCastleProvider());
     }
 
     /**
@@ -513,7 +514,7 @@ private static CommandLine parseArguments(Options options, String[] args)
         if (line.hasOption("help")) {
             HelpFormatter formatter = HelpFormatter.builder().get();
             System.out.println();
-            formatter.printHelp(EbicsClient.class.getSimpleName(), "",options, "", true);
+            formatter.printHelp(EbicsClient.class.getSimpleName(), "", options, "", true);
             System.out.println();
             System.exit(0);
         }
@@ -591,7 +592,7 @@ public static void main(String[] args) throws Exception {
         addOption(options, OrderType.HPB, "Send HPB request");
         options.addOption(null, "letters", false, "Create INI Letters");
         options.addOption(null, "create", false, "Create and initialize EBICS user");
-        addOption(options, OrderType.STA,"Fetch STA file (MT940 file)");
+        addOption(options, OrderType.STA, "Fetch STA file (MT940 file)");
         addOption(options, OrderType.VMK, "Fetch VMK file (MT942 file)");
         addOption(options, OrderType.C52, "Fetch camt.052 file");
         addOption(options, OrderType.C53, "Fetch camt.053 file");

src/main/java/org/kopi/ebics/client/FileTransfer.java

@@ -14,7 +14,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * $Id$
  */
 
 package org.kopi.ebics.client;
@@ -73,7 +72,6 @@
  * asymmetrical encryption takes place with the public encryption key of the non-technical
  * subscriber, i.e. the submitter of the order.
  *
- * @author Hachani
  *
  */
 public class FileTransfer {

src/main/java/org/kopi/ebics/client/HttpRequestSender.java

@@ -14,7 +14,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * $Id$
  */
 
 package org.kopi.ebics.client;

src/main/java/org/kopi/ebics/client/KeyManagement.java

@@ -14,7 +14,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
- * $Id$
  */
 
 package org.kopi.ebics.client;
@@ -48,7 +47,6 @@
  * Then wait until the bank activated your keys.
  * If you are migrating from FTAM. Just send HPB, your EBICS account should be usable without delay.
  *
- * @author Hachani
  *
  */
 public class KeyManagement {