Improve AJ Bell Securities Limited PDF-Importer

small corrections regEx

Author: Nirus2000

name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/AJBellSecuritiesLimitedPDFExtractor.java

@@ -43,12 +43,12 @@ public String getLabel()
 
     private void addBuySellTransaction()
     {
-        DocumentType type = new DocumentType("CONTRACT NOTE");
+        var type = new DocumentType("CONTRACT NOTE");
         this.addDocumentTyp(type);
 
-        Transaction<BuySellEntry> pdfTransaction = new Transaction<>();
+        var pdfTransaction = new Transaction<BuySellEntry>();
 
-        Block firstRelevantLine = new Block("^Account No\\. .*$");
+        var firstRelevantLine = new Block("^Account No\\. .*$");
         type.addBlock(firstRelevantLine);
         firstRelevantLine.set(pdfTransaction);
 
@@ -75,7 +75,7 @@ private void addBuySellTransaction()
                         .find("We have (bought|sold) for you as agent") //
                         .match("^(?<name>.*)$") //
                         .match("^(?<name1>.*)$") //
-                        .match("^.*([\\s]{1,})[\\.,\\d]+ [\\.,\\d]+([\\s]{1,})[\\.,\\d]+ (?<currency>[\\w]{3})$") //
+                        .match("^.*([\\s]{1,})[\\.,\\d]+ [\\.,\\d]+([\\s]{1,})[\\.,\\d]+ (?<currency>[A-Z]{3})$") //
                         .assign((t, v) -> {
                             if (!v.get("name1").startsWith("Venue"))
                                 v.put("name", v.get("name") + " " + v.get("name1"));
@@ -88,7 +88,7 @@ private void addBuySellTransaction()
                         // XLON                   470 67.3483        31,653.70 GBP
                         // @formatter:on
                         .section("shares") //
-                        .match("^.*([\\s]{1,})(?<shares>[\\.,\\d]+) [\\.,\\d]+([\\s]{1,})[\\.,\\d]+ [\\w]{3}$") //
+                        .match("^.*[\\s]{1,}(?<shares>[\\.,\\d]+) [\\.,\\d]+[\\s]{1,}[\\.,\\d]+ [A-Z]{3}$") //
                         .assign((t, v) -> t.setShares(asShares(v.get("shares"))))
 
                         // @formatter:off
@@ -103,7 +103,7 @@ private void addBuySellTransaction()
                         // Total credit     15,783.20 GBP
                         // @formatter:on
                         .section("currency", "amount") //
-                        .match("^Total (debit|credit)([\\s]{1,})(?<amount>[\\.,\\d]+) (?<currency>[\\w]{3})$") //
+                        .match("^Total (debit|credit)[\\s]{1,}(?<amount>[\\.,\\d]+) (?<currency>[A-Z]{3})$") //
                         .assign((t, v) -> {
                             t.setCurrencyCode(asCurrencyCode(v.get("currency")));
                             t.setAmount(asAmount(v.get("amount")));
@@ -113,7 +113,7 @@ private void addBuySellTransaction()
                         // 05/12/19 13.15 11/12/19 Bought BF41Q72 C5L6DQ
                         // @formatter:on
                         .section("note").optional() //
-                        .match("^[\\d]{2}\\/[\\d]{2}\\/[\\d]{2} [\\d]{2}\\.[\\d]{2} [\\d]{2}\\/[\\d]{2}\\/[\\d]{2} (Bought|Sold)([\\s]{1,})[A-Z0-9]{7} (?<note>.*)$") //
+                        .match("^[\\d]{2}\\/[\\d]{2}\\/[\\d]{2} [\\d]{2}\\.[\\d]{2} [\\d]{2}\\/[\\d]{2}\\/[\\d]{2} (Bought|Sold)[\\s]{1,}[A-Z0-9]{7} (?<note>.*)$") //
                         .assign((t, v) -> t.setNote("Ref. No. " + trim(v.get("note"))))
 
                         .wrap(BuySellEntryItem::new);
@@ -129,7 +129,7 @@ private <T extends Transaction<?>> void addFeesSectionsTransaction(T transaction
                         // Dealing charge 1.50 GBP
                         // @formatter:on
                         .section("fee", "currency").optional() //
-                        .match("^Dealing charge([\\s]{1,})(?<fee>[\\.,\\d]+) (?<currency>[\\w]{3})$") //
+                        .match("^Dealing charge[\\s]{1,}(?<fee>[\\.,\\d]+) (?<currency>[A-Z]{3})$") //
                         .assign((t, v) -> processFeeEntries(t, v, type));
     }