update to EBICS 3.0 (H005)

Author: uwemaurer

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

@@ -32,7 +32,7 @@
 /**
  * Simple implementation of an EBICS bank.
  * This object is serializable to facilitate persisting of the values.
- * Save the the object whenever it needs to be saved.
+ * Save the object whenever it needs to be saved.
  *
  * @author Hachani
  *
@@ -131,15 +131,15 @@ public String getName() {
 
     @Override
     public boolean useCertificate() {
-        return useCertificate;
+      return useCertificate;
     }
 
     @Override
     public void setUseCertificate(boolean useCertificate) {
         this.useCertificate = useCertificate;
         needSave = true;
     }
-    
+
   @Override
   public void setBankKeys(RSAPublicKey e002Key, RSAPublicKey x002Key) {
     this.e002Key = e002Key;

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

@@ -26,7 +26,6 @@
 import java.io.ObjectInputStream;
 import java.net.URL;
 import java.security.GeneralSecurityException;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -53,7 +52,6 @@
 import org.kopi.ebics.interfaces.PasswordCallback;
 import org.kopi.ebics.io.IOUtils;
 import org.kopi.ebics.messages.Messages;
-import org.kopi.ebics.schema.h003.OrderAttributeType;
 import org.kopi.ebics.session.DefaultConfiguration;
 import org.kopi.ebics.session.EbicsSession;
 import org.kopi.ebics.session.OrderType;
@@ -73,10 +71,6 @@ private static File getRootDir() {
         return new File(System.getProperty("user.home"), "ebics" + File.separator + "client");
     }
 
-    static {
-        // this is for the logging config
-        System.setProperty("ebicsBasePath", getRootDir().getAbsolutePath());
-    }
     private static final Logger log = LoggerFactory.getLogger(EbicsClient.class);
 
     private final Configuration configuration;
@@ -230,7 +224,7 @@ private void createLetters(EbicsUser user, boolean useCertificates)
         throws GeneralSecurityException, IOException, EbicsException {
         user.getPartner().getBank().setUseCertificate(useCertificates);
         LetterManager letterManager = configuration.getLetterManager();
-        List<InitLetter> letters = Arrays.asList(letterManager.createA005Letter(user),
+        List<InitLetter> letters = List.of(letterManager.createA005Letter(user),
             letterManager.createE002Letter(user), letterManager.createX002Letter(user));
 
         File directory = configuration.getLettersDirectory(user);
@@ -390,15 +384,14 @@ public void revokeSubscriber(User user, Product product) throws Exception {
      */
     public void sendFile(File file, User user, Product product, EbicsOrderType orderType) throws Exception {
         EbicsSession session = createSession(user, product);
-        OrderAttributeType.Enum orderAttribute = OrderAttributeType.OZHNN;
 
         FileTransfer transferManager = new FileTransfer(session);
 
         configuration.getTraceManager().setTraceDirectory(
             configuration.getTransferTraceDirectory(user));
 
         try {
-            transferManager.sendFile(IOUtils.getFileContent(file), orderType, orderAttribute);
+            transferManager.sendFile(IOUtils.getFileContent(file), orderType);
         } catch (IOException | EbicsException e) {
             log
                 .error(messages.getString("upload.file.error", file.getAbsolutePath()), e);
@@ -411,7 +404,7 @@ public void sendFile(File file, EbicsOrderType orderType) throws Exception {
     }
 
     public void fetchFile(File file, User user, Product product, EbicsOrderType orderType,
-        boolean isTest, Date start, Date end) throws IOException, EbicsException {
+        boolean isTest) throws IOException, EbicsException {
         FileTransfer transferManager;
         EbicsSession session = createSession(user, product);
         session.addSessionParam("FORMAT", "pain.xxx.cfonb160.dct");
@@ -424,7 +417,7 @@ public void fetchFile(File file, User user, Product product, EbicsOrderType orde
             configuration.getTransferTraceDirectory(user));
 
         try {
-            transferManager.fetchFile(orderType, start, end, file);
+            transferManager.fetchFile(orderType, file);
         } catch (NoDownloadDataAvailableException e) {
             // don't log this exception as an error, caller can decide how to handle
             throw e;
@@ -436,7 +429,7 @@ public void fetchFile(File file, User user, Product product, EbicsOrderType orde
 
     public void fetchFile(File file, EbicsOrderType orderType, Date start, Date end) throws IOException,
         EbicsException {
-        fetchFile(file, defaultUser, defaultProduct, orderType, false, start, end);
+        fetchFile(file, defaultUser, defaultProduct, orderType, false);
     }
 
     /**
@@ -657,7 +650,7 @@ public static void main(String[] args) throws Exception {
         for (EbicsOrderType type : fetchFileOrders) {
             if (hasOption(cmd, type)) {
                 client.fetchFile(getOutputFile(outputFileValue), client.defaultUser,
-                    client.defaultProduct, type, false, null, null);
+                    client.defaultProduct, type, false);
                 break;
             }
         }

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

@@ -22,15 +22,13 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Date;
 
 import org.kopi.ebics.exception.EbicsException;
 import org.kopi.ebics.interfaces.ContentFactory;
 import org.kopi.ebics.interfaces.EbicsOrderType;
 import org.kopi.ebics.io.ByteArrayContentFactory;
 import org.kopi.ebics.io.Joiner;
 import org.kopi.ebics.messages.Messages;
-import org.kopi.ebics.schema.h003.OrderAttributeType;
 import org.kopi.ebics.session.EbicsSession;
 import org.kopi.ebics.utils.Constants;
 import org.kopi.ebics.utils.Utils;
@@ -95,12 +93,12 @@ public FileTransfer(EbicsSession session) {
    * @throws IOException
    * @throws EbicsException
    */
-  public void sendFile(byte[] content, EbicsOrderType orderType, OrderAttributeType.Enum orderAttribute)
+  public void sendFile(byte[] content, EbicsOrderType orderType)
     throws IOException, EbicsException
   {
     HttpRequestSender sender = new HttpRequestSender(session);
     UploadInitializationRequestElement initializer = new UploadInitializationRequestElement(session,
-	                                            orderType, orderAttribute,
+	                                            orderType,
 	                                            content);
     initializer.build();
     initializer.validate();
@@ -129,7 +127,7 @@ public void sendFile(byte[] content, EbicsOrderType orderType, OrderAttributeTyp
    * @param factory the content factory that contain the segment data.
    * @param segmentNumber the segment number
    * @param lastSegment is it the last segment?
-   * @param transactionId the transaction Id
+   * @param transactionId the transaction id
    * @param orderType the order type
    * @throws IOException
    * @throws EbicsException
@@ -172,23 +170,16 @@ public void sendFile(ContentFactory factory,
    * This type of transfer will run until everything is processed.
    * No transaction recovery is possible.
    * @param orderType type of file to fetch
-   * @param start optional begin of fetch term
-   * @param end optional end of fetch term
    * @param outputFile where to put the data
    * @throws IOException communication error
    * @throws EbicsException server generated error
    */
   public void fetchFile(EbicsOrderType orderType,
-                        Date start,
-                        Date end,
                         File outputFile)
     throws IOException, EbicsException
   {
     var sender = new HttpRequestSender(session);
-    var initializer = new DownloadInitializationRequestElement(session,
-	                                            orderType,
-	                                            start,
-	                                            end);
+      var initializer = new DownloadInitializationRequestElement(session, orderType);
     initializer.build();
     initializer.validate();