Merge pull request #12 from tiagoppinho/STDSDK-13

Add missing replacement chars and remove conflicting. STDSDK-13 #resolve
ist-dsi · Jan 21, 2020 · 13015aa · 13015aa
2 parents dbb74a3 + 5f1ce19
commit 13015aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
     <name>Santander SDK</name>
 
     <properties>
-        <version.org.fenixedu.bennu>6.3.1</version.org.fenixedu.bennu>
+        <version.org.fenixedu.bennu>6.5.0</version.org.fenixedu.bennu>
         <version.org.apache.cxf>3.1.10</version.org.apache.cxf>
         <version.org.imgscalr.imgscalr-lib>4.2</version.org.imgscalr.imgscalr-lib>
     </properties>

diff --git a/src/main/java/org/fenixedu/santandersdk/service/SantanderLineGenerator.java b/src/main/java/org/fenixedu/santandersdk/service/SantanderLineGenerator.java
@@ -2,6 +2,7 @@
 
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -27,7 +28,7 @@ public class SantanderLineGenerator {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SantanderLineGenerator.class);
     private final Map<String, String> charReplacementMap = new HashMap<>();
-    private final CharsetEncoder latin1CharsetEncoder = Charset.forName("ISO-8859-1").newEncoder();
+    private final CharsetEncoder latin1CharsetEncoder = StandardCharsets.ISO_8859_1.newEncoder();
 
     private SantanderEntryValidator santanderEntryValidator;
 
@@ -375,7 +376,8 @@ private void fillCharReplacementMap() {
         charReplacementMap.put("Ü", "U");
         charReplacementMap.put("ş", "s");
         charReplacementMap.put("Ş", "S");
-        charReplacementMap.put("'", " ");
+        charReplacementMap.put("Ä", "A");
+        charReplacementMap.put("ä", "a");
     }
 
 }