Person name formatter with REST.

Author: fabiankessler

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

@@ -0,0 +1,32 @@
+package org.nameapi.client.services.formatter.personnameformatter;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.nameapi.ontology5.input.entities.person.InputPerson;
+import org.nameapi.ontology5.services.formatter.FormatterProperties;
+
+/**
+ *
+ */
+public class PersonNameFormatterArgument {
+
+    @NotNull
+    private final InputPerson inputPerson;
+    @Nullable
+    private final FormatterProperties properties;
+
+    public PersonNameFormatterArgument(@NotNull InputPerson inputPerson, @Nullable FormatterProperties properties) {
+        this.inputPerson = inputPerson;
+        this.properties = properties;
+    }
+
+    @NotNull
+    public InputPerson getInputPerson() {
+        return inputPerson;
+    }
+
+    @Nullable
+    public FormatterProperties getProperties() {
+        return properties;
+    }
+}

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

@@ -5,7 +5,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.nameapi.client.services.NameApiBaseCommand;
 import org.nameapi.ontology5.services.formatter.FormatterResult;
-import org.nameapi.ontology5.services.formatter.personnameformatter.PersonNameFormatterArgument;
 
 import java.util.concurrent.Callable;
 
@@ -26,7 +25,7 @@ public PersonNameFormatterCommand() {
 
     @Override
     public FormatterResult call(@NotNull Optional<PersonNameFormatterArgument> arg, @NotNull ExecutionContext ec) throws Exception {
-        return getPort(ec).ping(getApiKey(ec));
+        return getPort(ec).call(getApiKey(ec), getContext(ec), arg.get().getInputPerson(), arg.get().getProperties());
     }
 
     @NotNull @Override

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

@@ -6,7 +6,11 @@
 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.formatter.FormatterProperties;
 import org.nameapi.ontology5.services.formatter.FormatterResult;
+import org.nameapi.ontology5.services.formatter.personnameformatter.PersonNameFormatterInput;
 
 /**
  *
@@ -19,13 +23,14 @@ public RestPort(RestHttpClient restApiClient, String servicePath) {
         super(restApiClient, servicePath);
     }
 
-    public FormatterResult ping(String apiKey) {
+    public FormatterResult call(String apiKey, Context context, InputPerson inputPerson, FormatterProperties properties) {
         QueryParams queryParams = QueryParams.create();
         queryParams.add("apiKey", apiKey);
 
-        RestHttpClientResponse<FormatterResult> response = restApiClient.invokeGet(
-                servicePath,
+        RestHttpClientResponse<FormatterResult> response = restApiClient.invokeBody(
+                servicePath, "POST",
                 queryParams, HeaderParams.none(),
+                new PersonNameFormatterInput(context, inputPerson, properties),
                 returnType
         );
         return response.getResult().get();

src/main/java/org/nameapi/client/services/formatter/personnameformatter/PersonNameFormatterArgument.java

@@ -5,11 +5,10 @@
 import org.nameapi.client.services.FunctionalTestsNameApiModeFactory;
 import org.nameapi.client.lib.NameApiRemoteExecutors;
 import org.nameapi.client.services.AbstractTest;
-import org.nameapi.client.services.formatter.FormatterProperties;
-import org.nameapi.client.services.formatter.FormatterPropertiesBuilder;
-import org.nameapi.client.services.formatter.FormatterResult;
 import org.nameapi.ontology5.input.entities.person.NaturalInputPerson;
 import org.nameapi.ontology5.input.entities.person.NaturalInputPersonBuilder;
+import org.nameapi.ontology5.services.formatter.FormatterProperties;
+import org.nameapi.ontology5.services.formatter.FormatterResult;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
@@ -26,7 +25,8 @@ public void testCall() throws Exception {
         Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
 
         NaturalInputPerson person = new NaturalInputPersonBuilder().name(makeName("petra müller")).build();
-        FormatterProperties properties = new FormatterPropertiesBuilder().build();
+//        FormatterProperties properties = new FormatterPropertiesBuilder().build();
+        FormatterProperties properties = new FormatterProperties();
         PersonNameFormatterArgument argument = new PersonNameFormatterArgument(person, properties);
         FormatterResult formatterResult = executor.execute(command, mode, argument).get();
         assertEquals(formatterResult.getFormatted(), "Petra Müller");