REST: adapted to changes in anythingworks.

Author: fabiankessler

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

@@ -12,31 +12,6 @@
  */
 public class ExceptionThrowerCommand extends NameApiBaseCommand<RestPort, ExceptionThrowerParams, String> {
 
-//    @Override
-//    public String call(@NotNull Optional<ExceptionType> arg, @NotNull ExecutionContext ec) throws Exception {
-//        SoapExceptionThrower port = getPort(ec);
-//        SoapContext context = getContext(ec);
-//        ExceptionType.assertSize(5);
-//        switch (arg.get()) {
-//            case InvalidInput:
-//                return port.throwInvalidInput(context);
-//            case Internal:
-//                return port.throwInternal(context);
-//            case AccessDeniedNoSuchAccount:
-//                return port.throwAccessDeniedNoSuchAccount(context);
-//            case AccessDeniedRequestLimitExceeded:
-//                return port.throwAccessDeniedRequestLimitExceeded(context);
-//            case AccessDeniedTooManyConcurrentRequests:
-//                return port.throwAccessDeniedTooManyConcurrentRequests(context);
-//            default:
-//                throw new AssertionError("Dead code reached!");
-//        }
-//    }
-
-
-
-
-
     private static final String SERVICE_PATH = "/development/exceptionthrower";
 
     public ExceptionThrowerCommand() {
@@ -45,7 +20,7 @@ public ExceptionThrowerCommand() {
 
     @Override
     public String call(@NotNull Optional<ExceptionThrowerParams> arg, @NotNull ExecutionContext ec) throws Exception {
-        return getPort(ec).call(getApiKey(ec));
+        return getPort(ec).call(getApiKey(ec), arg.get().getExceptionType(), arg.get().getExceptionChance());
     }
 
     @NotNull @Override

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

@@ -5,13 +5,6 @@
  */
 public class ExceptionThrowerParams {
 
-    public enum ExceptionType {
-        NotAuthorized,
-        Forbidden,
-        BadRequest,
-        InternalServerError
-    }
-
     public static class Builder {
         private ExceptionType exceptionType;
         private int exceptionChance = 100;

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

@@ -5,11 +5,13 @@
  */
 public enum ExceptionType {
     InvalidInput,
-    Internal,
 
     AccessDeniedNoSuchAccount,
-    AccessDeniedRequestLimitExceeded,
-    AccessDeniedTooManyConcurrentRequests;
+//    AccessDeniedRequestLimitExceeded,
+//    AccessDeniedTooManyConcurrentRequests,
+
+    InternalServerError,
+    ;
 
     /**
      * Developer: Call this before doing a switch on an enum value.

src/main/java/org/nameapi/client/services/development/exceptionthrower/ExceptionThrowerCommand.java

@@ -18,9 +18,11 @@ public RestPort(RestHttpClient restApiClient, String servicePath) {
         super(restApiClient, servicePath);
     }
 
-    public String call(String apiKey) {
+    public String call(String apiKey, ExceptionType exceptionType, int exceptionChance) {
         QueryParams queryParams = QueryParams.create();
         queryParams.add("apiKey", apiKey);
+        queryParams.add("exceptionType", exceptionType.name());
+        queryParams.add("exceptionChance", ""+exceptionChance);
 
         RestHttpClientResponse<String> response = restApiClient.invokeGet(
                 servicePath,

src/main/java/org/nameapi/client/services/development/exceptionthrower/ExceptionThrowerParams.java

@@ -1,32 +1,47 @@
 package org.nameapi.client.services.development.exceptionthrower;
 
+import com.optimaize.anythingworks.common.fault.exceptions.AccessDeniedServiceException;
+import com.optimaize.anythingworks.common.fault.exceptions.BadRequestServiceException;
+import com.optimaize.anythingworks.common.fault.exceptions.InternalServerErrorServiceException;
+import com.optimaize.anythingworks.common.fault.faultinfo.Blame;
+import com.optimaize.anythingworks.common.fault.faultinfo.RetryType;
 import com.optimaize.command4j.CommandExecutor;
 import com.optimaize.command4j.Mode;
 import org.nameapi.client.services.FunctionalTestsNameApiModeFactory;
 import org.nameapi.client.lib.NameApiRemoteExecutors;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
 
 /**
  */
 public class ExceptionThrowerCommandTest {
 
     private final CommandExecutor executor = NameApiRemoteExecutors.get();
 
-//    @Test(expectedExceptions = InvalidInputServiceException.class)
-//    public void testCall1() throws Exception {
-//        execute(ExceptionType.InvalidInput);
-//    }
-//
-//    @Test(expectedExceptions = InternalServiceException.class)
-//    public void testCall2() throws Exception {
-//        execute(ExceptionType.Internal);
-//    }
-//
-//
-//    @Test(expectedExceptions = AccessDeniedServiceException.class)
-//    public void testCall3() throws Exception {
-//        execute(ExceptionType.AccessDeniedNoSuchAccount);
-//    }
-//
+    @Test
+    public void testCall1() throws Exception {
+        try {
+            execute(ExceptionType.InvalidInput);
+            fail("Expected exception!");
+        } catch (BadRequestServiceException e) {
+            assertEquals(e.getFaultInfo().getBlame(), Blame.CLIENT);
+            assertEquals(e.getFaultInfo().getRetrySameLocation().get().getRetryType(), RetryType.NO);
+        }
+    }
+
+    @Test(expectedExceptions = InternalServerErrorServiceException.class)
+    public void testCall2() throws Exception {
+        execute(ExceptionType.InternalServerError);
+    }
+
+
+    @Test(expectedExceptions = AccessDeniedServiceException.class)
+    public void testCall3() throws Exception {
+        execute(ExceptionType.AccessDeniedNoSuchAccount);
+    }
+
 //    @Test(expectedExceptions = AccessDeniedServiceException.class)
 //    public void testCall4() throws Exception {
 //        execute(ExceptionType.AccessDeniedRequestLimitExceeded);
@@ -40,6 +55,6 @@ public class ExceptionThrowerCommandTest {
     private void execute(ExceptionType type) throws Exception {
         ExceptionThrowerCommand command = new ExceptionThrowerCommand();
         Mode mode = FunctionalTestsNameApiModeFactory.functionalTest();
-//        executor.execute(command, mode, type).get();
+        executor.execute(command, mode, new ExceptionThrowerParams(type, 100)).get();
     }
 }