Adding licensed field to SupportedLanguage and SupportedLanguagePair WS-1805

Author: TomHubbardBT

api/src/test/java/com/basistech/rosette/api/BasicTest.java

@@ -244,10 +244,12 @@ public void testLanguageSupport() throws Exception {
             assertTrue(resp.getSupportedLanguages().contains(SupportedLanguage.builder()
                     .language(LanguageCode.ENGLISH)
                     .script(ISO15924.Latn)
+                    .licensed(Boolean.TRUE)
                     .build()));
             assertTrue(resp.getSupportedLanguages().contains(SupportedLanguage.builder()
                     .language(LanguageCode.JAPANESE)
                     .script(ISO15924.Kana)
+                    .licensed(Boolean.FALSE)
                     .build()));
         }
     }
@@ -272,10 +274,12 @@ public void testNameSimilarityLanguageSupport() throws Exception {
             assertTrue(resp.getSupportedLanguagePairs().contains(SupportedLanguagePair.builder()
                     .source(new TextDomain(ISO15924.Latn, LanguageCode.ENGLISH, null))
                     .target(new TextDomain(ISO15924.Latn, LanguageCode.ENGLISH, null))
+                    .licensed(Boolean.TRUE)
                     .build()));
             assertTrue(resp.getSupportedLanguagePairs().contains(SupportedLanguagePair.builder()
                     .source(new TextDomain(ISO15924.Arab, LanguageCode.ARABIC, null))
                     .target(new TextDomain(ISO15924.Arab, LanguageCode.ARABIC, null))
+                    .licensed(Boolean.TRUE)
                     .build()));
         }
     }
@@ -300,10 +304,12 @@ public void testNameTranslationLanguageSupport() throws Exception {
             assertTrue(resp.getSupportedLanguagePairs().contains(SupportedLanguagePair.builder()
                     .source(new TextDomain(ISO15924.Latn, LanguageCode.ENGLISH, TransliterationScheme.NATIVE))
                     .target(new TextDomain(ISO15924.Latn, LanguageCode.ENGLISH, TransliterationScheme.IC))
+                    .licensed(Boolean.TRUE)
                     .build()));
             assertTrue(resp.getSupportedLanguagePairs().contains(SupportedLanguagePair.builder()
                     .source(new TextDomain(ISO15924.Arab, LanguageCode.ARABIC, TransliterationScheme.NATIVE))
                     .target(new TextDomain(ISO15924.Arab, LanguageCode.ARABIC, TransliterationScheme.NATIVE))
+                    .licensed(Boolean.TRUE)
                     .build()));
         }
     }

api/src/test/resources/name-similarity-supported-languages.json

@@ -1,6 +1,6 @@
 {
   "supportedLanguagePairs": [
-    {"source": {"language": "eng", "script": "Latn"}, "target": {"language": "eng", "script": "Latn"}},
-    {"source": {"language": "ara", "script": "Arab"}, "target": {"language": "ara", "script": "Arab"}}
+    {"source": {"language": "eng", "script": "Latn"}, "target": {"language": "eng", "script": "Latn"}, "licensed" : true },
+    {"source": {"language": "ara", "script": "Arab"}, "target": {"language": "ara", "script": "Arab"}, "licensed" : true }
   ]
 }

api/src/test/resources/name-translation-supported-languages.json

@@ -1,6 +1,7 @@
 {
   "supportedLanguagePairs": [
-    {"source": {"language": "eng", "script": "Latn", "transliterationScheme": "NATIVE"}, "target": {"language": "eng", "script": "Latn", "transliterationScheme": "IC"}},
-    {"source": {"language": "ara", "script": "Arab", "transliterationScheme": "NATIVE"}, "target": {"language": "ara", "script": "Arab", "transliterationScheme": "NATIVE"}}
+    {"source": {"language": "eng", "script": "Latn", "transliterationScheme": "NATIVE"}, "target": {"language": "eng", "script": "Latn", "transliterationScheme": "IC"},
+      "licensed" : true },
+    {"source": {"language": "ara", "script": "Arab", "transliterationScheme": "NATIVE"}, "target": {"language": "ara", "script": "Arab", "transliterationScheme": "NATIVE"}, "licensed": true }
   ]
 }

api/src/test/resources/supported-languages.json

@@ -1,6 +1,6 @@
 {
   "supportedLanguages": [
-    {"language": "eng", "script": "Latn"},
-    {"language": "jpn", "script": "Kana"}
+    {"language": "eng", "script": "Latn", "licensed" : true },
+    {"language": "jpn", "script": "Kana", "licensed" : false}
   ]
 }

model/src/main/java/com/basistech/rosette/apimodel/SupportedLanguage.java

@@ -20,7 +20,10 @@
 import com.basistech.util.ISO15924;
 import com.basistech.util.LanguageCode;
 import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.Value;
+import lombok.experimental.NonFinal;
 
 /**
  * Supported language/script
@@ -38,4 +41,12 @@ public class SupportedLanguage {
      * @return the script code
      */
     private final ISO15924 script;
+
+    /**
+     * @return if this language is licensed or not
+     */
+    @NonFinal
+    @Getter
+    @Setter
+    private Boolean licensed;
 }

model/src/main/java/com/basistech/rosette/apimodel/SupportedLanguagePair.java

@@ -18,9 +18,11 @@
 
 import com.basistech.rosette.annotations.JacksonMixin;
 import com.basistech.util.TextDomain;
-
 import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.Value;
+import lombok.experimental.NonFinal;
 
 /**
  * Supported language/script/scheme pairs
@@ -38,4 +40,12 @@ public class SupportedLanguagePair {
      * @return the target TextDomain
      */
     private final TextDomain target;
+
+    /**
+     * @return if this language pair is licensed or not
+     */
+    @NonFinal
+    @Getter
+    @Setter
+    private Boolean licensed;
 }