code fixes and exceptions mechanism

allegro · Sep 13, 2015 · d61f604 · d61f604
1 parent 6ae9885
commit d61f604
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 11 deletions.
diff --git a/src/main/java/pl/allegro/finance/tradukisto/internal/BaseValues.java b/src/main/java/pl/allegro/finance/tradukisto/internal/BaseValues.java
@@ -10,6 +10,8 @@ public interface BaseValues {
 
     Map<Integer, GenderForms> baseNumbers();
 
+    Map<Integer, String> exceptions();
+
     List<PluralForms> pluralForms();
 
     String currency();

diff --git a/src/main/java/pl/allegro/finance/tradukisto/internal/Container.java b/src/main/java/pl/allegro/finance/tradukisto/internal/Container.java
@@ -44,15 +44,17 @@ public static Container englishContainer() {
 
     public static Container germanContainer() {
 
-        GermanHundredsToWordsConverter germanHundredsToWordsConverter = new GermanHundredsToWordsConverter(new GermanValues().baseNumbers());
+        BaseValues values = new GermanValues();
+
+        GermanHundredsToWordsConverter germanHundredsToWordsConverter = new GermanHundredsToWordsConverter(
+                values.baseNumbers());
 
         IntegerToStringConverter converter = new GermanIntegerToWordsConverter(
-                new IntegerToWordsConverter(germanHundredsToWordsConverter, new GermanValues().pluralForms()),
+                new IntegerToWordsConverter(germanHundredsToWordsConverter, values.pluralForms()), values.exceptions(),
                 germanHundredsToWordsConverter);
 
         BigDecimalToStringConverter bigDecimalBankingMoneyValueConverter = new BigDecimalToBankingMoneyConverter(
-                converter,
-                new GermanValues().currency());
+                converter, values.currency());
 
         return new Container(converter, bigDecimalBankingMoneyValueConverter);
     }

diff --git a/src/main/java/pl/allegro/finance/tradukisto/internal/languages/czech/CzechValues.java b/src/main/java/pl/allegro/finance/tradukisto/internal/languages/czech/CzechValues.java
@@ -6,6 +6,7 @@
 import pl.allegro.finance.tradukisto.internal.languages.PluralForms;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -57,6 +58,11 @@ public Map<Integer, GenderForms> baseNumbers() {
                 .build();
     }
 
+    @Override
+    public Map<Integer, String> exceptions() {
+        return new HashMap<>();
+    }
+
     @Override
     public List<PluralForms> pluralForms() {
         return Arrays.<PluralForms>asList(

diff --git a/...va/pl/allegro/finance/tradukisto/internal/languages/czech/CzechValuesForSmallNumbers.java b/...va/pl/allegro/finance/tradukisto/internal/languages/czech/CzechValuesForSmallNumbers.java
@@ -6,6 +6,7 @@
 import pl.allegro.finance.tradukisto.internal.languages.PluralForms;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -23,6 +24,11 @@ public Map<Integer, GenderForms> baseNumbers() {
         return baseNumbers;
     }
 
+    @Override
+    public Map<Integer, String> exceptions() {
+        return new HashMap<>();
+    }
+
     @Override
     public List<PluralForms> pluralForms() {
         return Arrays.<PluralForms>asList(new CzechPluralForms());

diff --git a/src/main/java/pl/allegro/finance/tradukisto/internal/languages/english/EnglishValues.java b/src/main/java/pl/allegro/finance/tradukisto/internal/languages/english/EnglishValues.java
@@ -5,6 +5,7 @@
 import pl.allegro.finance.tradukisto.internal.languages.PluralForms;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -55,6 +56,11 @@ public Map<Integer, GenderForms> baseNumbers() {
                 .build();
     }
 
+    @Override
+    public Map<Integer, String> exceptions() {
+        return new HashMap<>();
+    }
+
     @Override
     public List<PluralForms> pluralForms() {
         return Arrays.<PluralForms>asList(

diff --git a/.../allegro/finance/tradukisto/internal/languages/german/GermanHundredsToWordsConverter.java b/.../allegro/finance/tradukisto/internal/languages/german/GermanHundredsToWordsConverter.java
@@ -20,7 +20,7 @@ public GermanHundredsToWordsConverter(Map<Integer, GenderForms> baseValues) {
     @Override
     public String asWords(Integer value, GenderType genderType) {
         if (baseValues.containsKey(value)) {
-            return baseValues.get(value).form();
+            return baseValues.get(value).formFor(genderType);
         } else if (Range.closed(21, 99).contains(value)) {
             return twoDigitsNumberAsString(value, genderType);
         } else if (Range.closed(101, 999).contains(value)) {

diff --git a/...l/allegro/finance/tradukisto/internal/languages/german/GermanIntegerToWordsConverter.java b/...l/allegro/finance/tradukisto/internal/languages/german/GermanIntegerToWordsConverter.java
@@ -7,20 +7,28 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class GermanIntegerToWordsConverter implements IntegerToStringConverter {
 
     private final IntegerToStringConverter bigNumbersConverter;
-    private final IntegerToStringConverter smallNumbersConverter;
+    private final Map<Integer, String> exceptions;
+    private final GenderAwareIntegerToStringConverter smallNumbersConverter;
 
     public GermanIntegerToWordsConverter(IntegerToStringConverter bigNumbersConverter,
+                                         Map<Integer, String> exceptions,
                                          GenderAwareIntegerToStringConverter smallNumbersConverter) {
         this.bigNumbersConverter = bigNumbersConverter;
+        this.exceptions = exceptions;
         this.smallNumbersConverter = smallNumbersConverter;
     }
 
     @Override
     public String asWords(Integer value) {
+        if (exceptions.containsKey(value)) {
+            return exceptions.get(value);
+        }
+
         Integer bigNumber = value / 1000000;
         Integer smallNumber = value % 1000000;
 
@@ -31,13 +39,13 @@ public String asWords(Integer value) {
         }
 
         if (smallNumber > 0) {
-            result.add(smallNumbersConverter.asWords(smallNumber));
+            result.add(smallNumbersConverter.asWords(smallNumber, GenderType.NON_APPLICABLE));
         }
 
-        return mergeResult(result);
+        return merge(result);
     }
 
-    private String mergeResult(List<String> result) {
+    private String merge(List<String> result) {
         if (result.isEmpty()) {
             return smallNumbersConverter.asWords(0, GenderType.NON_APPLICABLE);
         }

diff --git a/src/main/java/pl/allegro/finance/tradukisto/internal/languages/german/GermanValues.java b/src/main/java/pl/allegro/finance/tradukisto/internal/languages/german/GermanValues.java
@@ -1,5 +1,6 @@
 package pl.allegro.finance.tradukisto.internal.languages.german;
 
+import com.google.common.collect.ImmutableMap;
 import pl.allegro.finance.tradukisto.internal.BaseValues;
 import pl.allegro.finance.tradukisto.internal.languages.GenderForms;
 import pl.allegro.finance.tradukisto.internal.languages.GenderType;
@@ -57,6 +58,11 @@ public Map<Integer, GenderForms> baseNumbers() {
                 .build();
     }
 
+    @Override
+    public Map<Integer, String> exceptions() {
+        return ImmutableMap.<Integer, String>builder().put(1, "eins").build();
+    }
+
     @Override
     public List<PluralForms> pluralForms() {
         return Arrays.<PluralForms>asList(

diff --git a/src/main/java/pl/allegro/finance/tradukisto/internal/languages/polish/PolishValues.java b/src/main/java/pl/allegro/finance/tradukisto/internal/languages/polish/PolishValues.java
@@ -6,6 +6,7 @@
 import pl.allegro.finance.tradukisto.internal.languages.SlavonicPluralForms;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -56,6 +57,11 @@ public Map<Integer, GenderForms> baseNumbers() {
                 .build();
     }
 
+    @Override
+    public Map<Integer, String> exceptions() {
+        return new HashMap<>();
+    }
+
     @Override
     public List<PluralForms> pluralForms() {
         return Arrays.<PluralForms>asList(

diff --git a/src/main/java/pl/allegro/finance/tradukisto/internal/languages/russian/RussianValues.java b/src/main/java/pl/allegro/finance/tradukisto/internal/languages/russian/RussianValues.java
@@ -7,6 +7,7 @@
 import pl.allegro.finance.tradukisto.internal.languages.SlavonicPluralForms;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -58,6 +59,11 @@ public Map<Integer, GenderForms> baseNumbers() {
                 .build();
     }
 
+    @Override
+    public Map<Integer, String> exceptions() {
+        return new HashMap<>();
+    }
+
     @Override
     public List<PluralForms> pluralForms() {
         return Arrays.<PluralForms>asList(

diff --git a/...st/groovy/pl/allegro/finance/tradukisto/internal/languages/german/GermanValuesTest.groovy b/...st/groovy/pl/allegro/finance/tradukisto/internal/languages/german/GermanValuesTest.groovy
@@ -104,9 +104,14 @@ public class GermanValuesTest extends Specification {
         2147483647 | "zwei Milliarden einhundertsiebenundvierzig Millionen vierhundertdreiundachtzigtausendsechshundertsiebenundvierzig"
     }
 
-    def "should convert fasdfas"() {
+    def "should convert milliard in German"() {
         expect:
-        converter.asWords(1000000) == "eine Million"
+        converter.asWords(value) == words
+
+        where:
+        value      | words
+        1000000    | "eine Million"
+        2000000    | "zwei Millionen"
     }
 
     def "should convert any value in range of 0-999 in German"() {