Parser tests working.

Author: fabiankessler

lib/ontology/nameapi-ontology5-core/5.0-SNAPSHOT/nameapi-ontology5-core-5.0-SNAPSHOT-javadoc.jar

@@ -1,34 +1,43 @@
 package org.nameapi.client.services.parser.personnameparser;
 
+import com.google.common.base.Optional;
+import com.optimaize.command4j.ExecutionContext;
+import org.jetbrains.annotations.NotNull;
+import org.nameapi.client.services.NameApiBaseCommand;
+import org.nameapi.client.services.genderizer.persongenderizer.*;
+import org.nameapi.ontology5.input.entities.person.InputPerson;
+import org.nameapi.ontology5.services.genderizer.GenderizerResult;
+import org.nameapi.ontology5.services.parser.personnameparser.PersonNameParserResult;
+
+import java.util.concurrent.Callable;
+
 /**
  * Parses the name fields of a person's name.
  */
 public class PersonNameParserCommand
-//        extends NameApiBaseCommand<SoapPersonNameParser, InputPerson, PersonNameParserResult>
+        extends NameApiBaseCommand<RestPort, InputPerson, PersonNameParserResult>
 {
 
-//    private static final String servicePath = "/parser/personnameparser";
-//
-//    public PersonNameParserCommand() {
-//        super(SoapPersonNameParser.class);
-//    }
-//
-//    @Override @NotNull
-//    public PersonNameParserResult call(@NotNull Optional<InputPerson> arg, @NotNull ExecutionContext ec) throws Exception {
-//        SoapPersonNameParserResult result = getPort(ec).parse(getContext(ec), Conversions.convert(arg.get()));
-//        return ParserConversions.convertResult(result);
-//    }
-//
-//
-//    @NotNull @Override
-//    protected Callable<SoapPersonNameParser> createPort(@NotNull final ExecutionContext ec) {
-//        return new Callable<SoapPersonNameParser>() {
-//            @Override
-//            public SoapPersonNameParser call() throws Exception {
-//                URL url = makeUrl(ec, servicePath);
-//                return new SoapPersonNameParserService(url).getSoapPersonNameParserPort();
-//            }
-//        };
-//    }
+
+    private static final String SERVICE_PATH = "/parser/personnameparser";
+
+    public PersonNameParserCommand() {
+        super(RestPort.class);
+    }
+
+    @Override
+    public PersonNameParserResult call(@NotNull Optional<InputPerson> arg, @NotNull ExecutionContext ec) throws Exception {
+        return getPort(ec).call(getApiKey(ec), getContext(ec), arg.get());
+    }
+
+    @NotNull @Override
+    protected Callable<RestPort> createPort(@NotNull final ExecutionContext ec) {
+        return new Callable<RestPort>() {
+            @Override
+            public RestPort call() throws Exception {
+                return new RestPort(makeClient(ec), SERVICE_PATH);
+            }
+        };
+    }
 
 }

lib/ontology/nameapi-ontology5-core/5.0-SNAPSHOT/nameapi-ontology5-core-5.0-SNAPSHOT-sources.jar

@@ -0,0 +1,39 @@
+package org.nameapi.client.services.parser.personnameparser;
+
+import com.optimaize.anythingworks.client.rest.http.HeaderParams;
+import com.optimaize.anythingworks.client.rest.http.QueryParams;
+import com.optimaize.anythingworks.client.rest.http.RestHttpClient;
+import com.optimaize.anythingworks.client.rest.http.RestHttpClientResponse;
+import com.optimaize.anythingworks.common.rest.TypeRef;
+import org.nameapi.client.services.RestServicePort;
+import org.nameapi.ontology5.input.context.Context;
+import org.nameapi.ontology5.input.entities.person.InputPerson;
+import org.nameapi.ontology5.services.InputWithPerson;
+import org.nameapi.ontology5.services.genderizer.GenderizerResult;
+import org.nameapi.ontology5.services.parser.personnameparser.PersonNameParserResult;
+
+/**
+ *
+ */
+class RestPort extends RestServicePort {
+
+    private static final TypeRef returnType = new TypeRef<PersonNameParserResult>() {};
+
+    public RestPort(RestHttpClient restApiClient, String servicePath) {
+        super(restApiClient, servicePath);
+    }
+
+    public PersonNameParserResult call(String apiKey, Context context, InputPerson inputPerson) {
+        QueryParams queryParams = QueryParams.create();
+        queryParams.add("apiKey", apiKey);
+
+        RestHttpClientResponse<PersonNameParserResult> response = restApiClient.invokeBody(
+                servicePath, "POST",
+                queryParams, HeaderParams.none(),
+                new InputWithPerson(context, inputPerson),
+                returnType
+        );
+        return response.getResult().get();
+    }
+
+}

lib/ontology/nameapi-ontology5-core/5.0-SNAPSHOT/nameapi-ontology5-core-5.0-SNAPSHOT.jar

@@ -9,6 +9,8 @@
 import org.nameapi.ontology5.input.entities.person.NaturalInputPersonBuilder;
 import org.nameapi.ontology5.output.entities.person.name.OutputPersonName;
 import org.nameapi.ontology5.output.entities.person.name.TermType;
+import org.nameapi.ontology5.services.parser.personnameparser.ParsedPerson;
+import org.nameapi.ontology5.services.parser.personnameparser.PersonNameParserResult;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
@@ -24,11 +26,11 @@ public void testCall() throws Exception {
         PersonNameParserCommand command = new PersonNameParserCommand();
         Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
         NaturalInputPerson person = new NaturalInputPersonBuilder().name(makeName("Petra Müller")).build();
-//        PersonNameParserResult result = executor.execute(command, mode, person).get();
-//        ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
-//        OutputPersonName firstName = parsedPerson.getNames().get(0);
-//        assertEquals("Petra", firstName.getFirst(TermType.GIVENNAME).get().getString());
-//        assertEquals("Müller", firstName.getFirst(TermType.SURNAME).get().getString());
+        PersonNameParserResult result = executor.execute(command, mode, person).get();
+        ParsedPerson parsedPerson = result.getBestMatch().getParsedPerson();
+        OutputPersonName firstName = parsedPerson.getNames().get(0);
+        assertEquals("Petra", firstName.getFirst(TermType.GIVENNAME).get().getString());
+        assertEquals("Müller", firstName.getFirst(TermType.SURNAME).get().getString());
     }
 
 }