add v2 skills/ontology endpoints that contain certification skills

Author: JW Wesson

src/main/java/com/textkernel/tx/ApiEndpoints.java

@@ -84,6 +84,12 @@ private String sanitize(String indexOrDocId) throws IllegalArgumentException {
     String desSkillsExtract() { return prefix(false) + "/skills/extract"; }
     String desSkillsLookup() { return prefix(false) + "/skills/lookup"; }
     String desSkillsAutoComplete() { return prefix(false) + "/skills/autoComplete"; }
+    String desSkillsGetTaxonomyV2(TaxonomyFormat format) { return prefix(false) + "/skills/v2/taxonomy?format="+ format; }
+    String desSkillsGetMetadataV2() { return prefix(false) + "/skills/v2/metadata"; }
+    String desSkillsNormalizeV2() { return prefix(false) + "/skills/v2/normalize"; }
+    String desSkillsExtractV2() { return prefix(false) + "/skills/v2/extract"; }
+    String desSkillsLookupV2() { return prefix(false) + "/skills/v2/lookup"; }
+    String desSkillsAutoCompleteV2() { return prefix(false) + "/skills/v2/autoComplete"; }
     String desProfessionsGetTaxonomy(TaxonomyFormat format, String language) { return prefix(false) + "/professions/taxonomy?format="+ format +"&language="+ language; }
     String desProfessionsGetMetadata() { return prefix(false) + "/professions/metadata"; }
     String desProfessionsNormalize() { return prefix(false) + "/professions/normalize"; }
@@ -95,6 +101,12 @@ private String sanitize(String indexOrDocId) throws IllegalArgumentException {
     String desOntologySuggestProfessions() { return prefix(false) + "/ontology/suggest-professions"; }
     String desOntologyCompareSkillsToProfession() { return prefix(false) + "/ontology/compare-skills-to-profession"; }
     String desOntologySkillsSimilarityScore() { return prefix(false) + "/ontology/skills-similarity-score"; }
+    String desOntologySuggestSkillsFromProfessionsV2() { return prefix(false) + "/ontology/v2/suggest-skills-from-professions"; }
+    String desOntologySuggestSkillsFromSkillsV2() { return prefix(false) + "/ontology/v2/suggest-skills-from-skills"; }
+    String desOntologyCompareProfessionsV2() { return prefix(false) + "/ontology/v2/compare-professions"; }
+    String desOntologySuggestProfessionsV2() { return prefix(false) + "/ontology/v2/suggest-professions"; }
+    String desOntologyCompareSkillsToProfessionV2() { return prefix(false) + "/ontology/v2/compare-skills-to-profession"; }
+    String desOntologySkillsSimilarityScoreV2() { return prefix(false) + "/ontology/v2/skills-similarity-score"; }
 
     String jobDescriptionGenerate() { return prefix(false) + "/job-description/generate"; }
     String jobDescriptionSuggestSkills() { return prefix(false) + "/job-description/suggest-skills"; }

src/main/java/com/textkernel/tx/TxClient.java

@@ -15,4 +15,6 @@ public class SuggestSkillsFromProfessionsRequest {
     public int Limit = 10;
     /** The language to use for the returned descriptions. */
     public String OutputLanguage;
+    /** If specified, only these types of skills will be returned. The following values are acceptable: Professional, IT, Language, Soft, Certification, All. Only applicable in v2 endpoints. */
+    public List<String> Types;
 }

src/main/java/com/textkernel/tx/models/api/dataenrichment/ontology/request/SuggestSkillsFromProfessionsRequest.java

@@ -17,4 +17,6 @@ public class SuggestSkillsFromSkillsRequest {
     public int Limit = 25;
     /** The language to use for the returned descriptions. */
     public String OutputLanguage;
+    /** If specified, only these types of skills will be returned. The following values are acceptable: Professional, IT, Language, Soft, Certification, All. Only applicable in v2 endpoints. */
+    public List<String> Types;
 }

src/main/java/com/textkernel/tx/models/api/dataenrichment/ontology/request/SuggestSkillsFromSkillsRequest.java

@@ -11,6 +11,8 @@
 
 /** Request body for a 'SkillsAutocomplete' request */
 public class SkillsAutoCompleteRequest extends AutocompleteRequest {
-    /** If specified, only these types of skills will be returned. The following values are acceptable: Professional, IT, Language, Soft, All. */
+    /** If specified, only these types of skills will be returned. The following 
+     * values are acceptable: Professional, IT, Language, Soft, Certification (only when using v2 endpoints), All. 
+     * */
     public List<String> Types;
 }

src/main/java/com/textkernel/tx/models/api/dataenrichment/skills/request/SkillsAutoCompleteRequest.java

@@ -6,7 +6,7 @@ public class Skill {
     public String Description;
     /** The ID of the skill in the taxonomy. */
     public String Id;
-    /** Type of skill. Possible values are Professional, IT, Language, or Soft. */
+    /** Type of skill. Possible values are Professional, IT, Language, Soft, or Certification (only when using v2 endpoints). */
     public String Type;
     /** The language ISO 639-1 code. This will only appear for language skills (Type = Language). */
     public String IsoCode;

src/main/java/com/textkernel/tx/models/dataenrichment/Skill.java

@@ -14,15 +14,15 @@
 public class SDKTests extends TestBase {
 
     @Test
-    public void test404Message(){
+    public void test401Error(){
         DataCenter fakeDC = new DataCenter("https://api.us.textkernel.com/tx/v9/fake");
         TxClient client = new TxClient("1234", "1234", fakeDC);
 
         try {
             client.getAccountInfo();
         }
         catch (TxException e){
-            assertEquals(404, e.HttpStatusCode);
+            assertEquals(401, e.HttpStatusCode);
         }
     }
 

src/test/java/com/textkernel/tx/SDKTests.java

@@ -8,10 +8,13 @@
 import com.textkernel.tx.TestBase;
 import com.textkernel.tx.models.api.dataenrichment.TaxonomyFormat;
 import com.textkernel.tx.models.api.dataenrichment.ontology.response.SkillScore;
+import com.textkernel.tx.models.api.dataenrichment.skills.response.AutoCompleteSkillsResponse;
 
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,6 +45,23 @@ public void testSkillAutoComplete() {
         });
     }
 
+    @Test
+    public void testSkillAutoCompleteV2() {
+        AutoCompleteSkillsResponse[] wrapper = { null};
+
+        assertDoesNotThrow(() -> {
+            ArrayList<String> languages = new ArrayList<String>();
+            languages.add("en");
+            ArrayList<String> types = new ArrayList<String>();
+            types.add("certification");
+            wrapper[0] = Client.autocompleteSkillV2("soft", languages, "en", types, 10);
+        });
+
+        assertNotNull(wrapper[0].Value);
+        assertHasItems(wrapper[0].Value.Skills);
+        assertEquals("Certification", wrapper[0].Value.Skills.get(0).Type);
+    }
+
     @Test
     public void testSkillsLookup() {
         assertDoesNotThrow(() -> {