Improve Credit Suisse AG PDF-Importer

Format source to standard eclipse format Improve regulare expressions Remove obsolet source
portfolio-performance · Apr 4, 2024 · b1e5cba · b1e5cba
1 parent a102f50
commit b1e5cba
Show file tree

Hide file tree

Showing 3 changed files with 314 additions and 255 deletions.
diff --git a/...c/name/abuchen/portfolio/datatransfer/pdf/creditsuisseag/CreditSuisseAGExtractorTest.java b/...c/name/abuchen/portfolio/datatransfer/pdf/creditsuisseag/CreditSuisseAGExtractorTest.java
@@ -48,7 +48,7 @@ public void testWertpapierKauf01()
         Security security = results.stream().filter(SecurityItem.class::isInstance).findFirst()
                         .orElseThrow(IllegalArgumentException::new).getSecurity();
         assertThat(security.getIsin(), is("US46284V1017"));
-        assertNull(security.getWkn());
+        assertThat(security.getWkn(), is("26754105"));
         assertNull(security.getTickerSymbol());
         assertThat(security.getName(), is("Registered Shs Iron Mountain Inc"));
         assertThat(security.getCurrencyCode(), is(CurrencyUnit.USD));
@@ -112,7 +112,7 @@ public void testWertpapierKauf02()
         Security security = results.stream().filter(SecurityItem.class::isInstance).findFirst()
                         .orElseThrow(IllegalArgumentException::new).getSecurity();
         assertThat(security.getIsin(), is("XS1055787680"));
-        assertNull(security.getWkn());
+        assertThat(security.getWkn(), is("24160639"));
         assertNull(security.getTickerSymbol());
         assertThat(security.getName(), is("6.25 % Fixed Rate Notes Norddeutsche"));
         assertThat(security.getCurrencyCode(), is(CurrencyUnit.USD));
@@ -176,7 +176,7 @@ public void testWertpapierVerkauf01()
         Security security = results.stream().filter(SecurityItem.class::isInstance).findFirst()
                         .orElseThrow(IllegalArgumentException::new).getSecurity();
         assertThat(security.getIsin(), is("GB00B03MLX29"));
-        assertNull(security.getWkn());
+        assertThat(security.getWkn(), is("1987674"));
         assertNull(security.getTickerSymbol());
         assertThat(security.getName(), is("Akt. -A- Royal Dutch Shell PLC"));
         assertThat(security.getCurrencyCode(), is(CurrencyUnit.EUR));
@@ -220,7 +220,7 @@ public void testWertpapierVerkauf02()
         Security security = results.stream().filter(SecurityItem.class::isInstance).findFirst()
                         .orElseThrow(IllegalArgumentException::new).getSecurity();
         assertThat(security.getIsin(), is("US88163VAD10"));
-        assertNull(security.getWkn());
+        assertThat(security.getWkn(), is("2429251"));
         assertNull(security.getTickerSymbol());
         assertThat(security.getName(), is("6.15 % Notes Teva Pharmaceutical Finance"));
         assertThat(security.getCurrencyCode(), is(CurrencyUnit.USD));
@@ -283,7 +283,7 @@ public void testDividende01()
         Security security = results.stream().filter(SecurityItem.class::isInstance).findFirst()
                         .orElseThrow(IllegalArgumentException::new).getSecurity();
         assertThat(security.getIsin(), is("XS1055787680"));
-        assertNull(security.getWkn());
+        assertThat(security.getWkn(), is("24160639"));
         assertNull(security.getTickerSymbol());
         assertThat(security.getName(), is("6.25 % FIXED RATE NOTES NORDDEUTSCHE"));
         assertThat(security.getCurrencyCode(), is(CurrencyUnit.USD));
@@ -326,7 +326,7 @@ public void testDividende02()
         Security security = results.stream().filter(SecurityItem.class::isInstance).findFirst()
                         .orElseThrow(IllegalArgumentException::new).getSecurity();
         assertThat(security.getIsin(), is("US46284V1017"));
-        assertNull(security.getWkn());
+        assertThat(security.getWkn(), is("26754105"));
         assertNull(security.getTickerSymbol());
         assertThat(security.getName(), is("REGISTERED SHS IRON MOUNTAIN INC"));
         assertThat(security.getCurrencyCode(), is(CurrencyUnit.USD));

diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/BankSLMPDFExtractor.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/BankSLMPDFExtractor.java
@@ -95,7 +95,7 @@ private void addBuySellTransaction()
                         // @formatter:on
                         .section("shares") //
                         .find("Wir haben.*")
-                        .match("^(?<shares>[\\.',\\d]+) .*$") //
+                        .match("^(?<shares>[\\.'\\d]+) .*$") //
                         .assign((t, v) -> t.setShares(asShares(v.get("shares"))))
 
                         // @formatter:off