Renamed new result class to be consistent.

Author: fabiankessler

src/main/java/org/nameapi/client/services/email/emailnameparser2/EmailAddressParsingResultType2.java

@@ -2,7 +2,7 @@
 package org.nameapi.client.services.email.emailnameparser2;
 
 /**
- * Belongs to {@link org.nameapi.client.services.email.emailnameparser2.EmailNameParserResult}, tells what was detected.
+ * Belongs to {@link EmailNameParser2Result}, tells what was detected.
  *
  * Difference to the EmailAddressParsingResultType:
  * The enum uses FUNCTIONAL instead of DEPARTMENT and TECHNICAL because the two can hardly be told apart.

src/main/java/org/nameapi/client/services/email/emailnameparser2/EmailNameParser2Command.java

@@ -41,7 +41,7 @@
  * </p>
  */
 public class EmailNameParser2Command
-        extends NameApiBaseCommand<SoapEmailNameParser2, String, EmailNameParserResult>
+        extends NameApiBaseCommand<SoapEmailNameParser2, String, EmailNameParser2Result>
 {
 
     private static final String servicePath = "/email/emailnameparser2";
@@ -51,18 +51,18 @@ public EmailNameParser2Command() {
     }
 
     @Override @NotNull
-    public EmailNameParserResult call(@NotNull Optional<String> arg, @NotNull ExecutionContext ec) throws Exception {
+    public EmailNameParser2Result call(@NotNull Optional<String> arg, @NotNull ExecutionContext ec) throws Exception {
         SoapEmailNameParserResult2 soapResult = getPort(ec).parse(getContext(ec), arg.get());
         return convert(soapResult);
     }
 
     @NotNull
-    private EmailNameParserResult convert(@NotNull SoapEmailNameParserResult2 soapResult) {
+    private EmailNameParser2Result convert(@NotNull SoapEmailNameParserResult2 soapResult) {
         List<EmailNameParserMatch> matches = new ArrayList<>();
         for (SoapEmailNameParserMatch soapMatch : soapResult.getMatches()) {
             matches.add( convert(soapMatch) );
         }
-        return new EmailNameParserResultImpl(soapResult.getResultType(), matches);
+        return new EmailNameParser2ResultImpl(soapResult.getResultType(), matches);
     }
     @NotNull
     private EmailNameParserMatch convert(@NotNull SoapEmailNameParserMatch soapMatch) {

…ilnameparser2/EmailNameParserResult.java …lnameparser2/EmailNameParser2Result.javasrc/main/java/org/nameapi/client/services/email/emailnameparser2/EmailNameParserResult.java renamed to src/main/java/org/nameapi/client/services/email/emailnameparser2/EmailNameParser2Result.java src/main/java/org/nameapi/client/services/email/emailnameparser2/EmailNameParserResult.java renamed to src/main/java/org/nameapi/client/services/email/emailnameparser2/EmailNameParser2Result.java

@@ -9,7 +9,7 @@
 
 /**
  */
-public interface EmailNameParserResult {
+public interface EmailNameParser2Result {
 
     @NotNull
     EmailAddressParsingResultType2 getResultType();

…meparser2/EmailNameParserResultImpl.java …eparser2/EmailNameParser2ResultImpl.javasrc/main/java/org/nameapi/client/services/email/emailnameparser2/EmailNameParserResultImpl.java renamed to src/main/java/org/nameapi/client/services/email/emailnameparser2/EmailNameParser2ResultImpl.java src/main/java/org/nameapi/client/services/email/emailnameparser2/EmailNameParserResultImpl.java renamed to src/main/java/org/nameapi/client/services/email/emailnameparser2/EmailNameParser2ResultImpl.java

@@ -3,7 +3,6 @@
 import com.google.common.base.Optional;
 import crema.annotation.Immutable;
 import org.jetbrains.annotations.NotNull;
-import org.nameapi.client.services.email.emailnameparser.EmailAddressParsingResultType;
 import org.nameapi.client.services.email.emailnameparser.EmailNameParserMatch;
 
 import java.util.Collections;
@@ -12,14 +11,14 @@
 /**
  */
 @Immutable
-class EmailNameParserResultImpl implements EmailNameParserResult {
+class EmailNameParser2ResultImpl implements EmailNameParser2Result {
 
     @NotNull
     private final EmailAddressParsingResultType2 resultType;
     @NotNull
     private final List<EmailNameParserMatch> matches;
 
-    EmailNameParserResultImpl(@NotNull EmailAddressParsingResultType2 resultType, @NotNull List<EmailNameParserMatch> matches) {
+    EmailNameParser2ResultImpl(@NotNull EmailAddressParsingResultType2 resultType, @NotNull List<EmailNameParserMatch> matches) {
         this.resultType = resultType;
         this.matches    = Collections.unmodifiableList(matches);
     }

src/test/functional/java/org/nameapi/client/services/email/emailnameparser2/EmailNameParser2CommandTest.java

@@ -4,7 +4,6 @@
 import com.optimaize.command4j.Mode;
 import org.nameapi.client.lib.NameApiRemoteExecutors;
 import org.nameapi.client.services.FunctionalTestsNameApiModeFactory;
-import org.nameapi.client.services.email.emailnameparser.EmailAddressParsingResultType;
 import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
@@ -19,7 +18,7 @@ public class EmailNameParser2CommandTest {
     public void testParse_John_Doe() throws Exception {
         EmailNameParser2Command command = new EmailNameParser2Command();
         Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
-        EmailNameParserResult result = executor.execute(command, mode, "[email protected]").get();
+        EmailNameParser2Result result = executor.execute(command, mode, "[email protected]").get();
         assertEquals(result.getResultType(), EmailAddressParsingResultType2.PERSON_NAME);
         assertEquals(result.getBestNameMatch().get().getGivenNames().get(0).getName(), "john");
         assertEquals(result.getBestNameMatch().get().getSurnames().get(0).getName(), "doe");
@@ -29,7 +28,7 @@ public void testParse_John_Doe() throws Exception {
     public void testParse_webmaster() throws Exception {
         EmailNameParser2Command command = new EmailNameParser2Command();
         Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
-        EmailNameParserResult result = executor.execute(command, mode, "[email protected]").get();
+        EmailNameParser2Result result = executor.execute(command, mode, "[email protected]").get();
         assertEquals(result.getResultType(), EmailAddressParsingResultType2.FUNCTIONAL);
     }