#52 some unit tests around objectMasks, groundwork for withMask() improvements

allmightyspiff · allmightyspiff · commit bb92e07dc8ae · 2018-06-18T18:19:15.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@
 /gen/build.log
 /examples/target
 settings.xml
+.DS_Store
diff --git a/src/main/java/com/softlayer/api/Mask.java b/src/main/java/com/softlayer/api/Mask.java
@@ -4,7 +4,6 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 /** Object mask parameter. See http://sldn.softlayer.com/article/Object-Masks */
 public class Mask {
@@ -45,32 +44,7 @@ protected String getMask() {
 
     @Override
     public String toString() {
-        String subMask = new String();
-        String objectMask = new String();
-        String builtMask = toString(new StringBuilder()).toString();
-        if(builtMask.contains("[")){
-            String [] mask = builtMask.split(Pattern.quote("["));
-            for (int count = 0; count < mask.length; count ++ ) {
-                if (count != 0){
-                    subMask = new StringBuilder().append(subMask).append("[").append(mask[count]).toString();
-                }
-            }
-            objectMask = subMask.substring(1, subMask.length());
-        }
-        else {
-            if(builtMask.contains(".")){
-                String [] mask = builtMask.split(Pattern.quote("."));
-                for (int count = 0; count < mask.length; count ++ ) {
-                    if (count != 0){
-                        objectMask = new StringBuilder().append(objectMask).append(mask[count]).append(".").toString();
-                    }
-                }
-            }else {
-                objectMask = builtMask + ".";
-            }
-        }
-        String resultMask = objectMask.substring(0, objectMask.length()-1);
-        return resultMask;
+        return toString(new StringBuilder()).toString();
     }
 
     /** Append this mask's string representation to the given builder and return it */
diff --git a/src/main/java/com/softlayer/api/RestApiClient.java b/src/main/java/com/softlayer/api/RestApiClient.java
@@ -304,6 +304,7 @@ public Object logAndHandleResponse(HttpResponse response, String url,
         }
         
         public Object invokeService(Method method, final Object[] args) throws Throwable {
+            System.out.print("invokeService: " + method + "\n");
             ApiMethod methodInfo = method.getAnnotation(ApiMethod.class);
             // Must have ID if instance is required
             if (methodInfo.instanceRequired() && id == null) {
@@ -440,7 +441,7 @@ public boolean isDone() {
         @Override
         public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
             boolean noParams = args == null || args.length == 0;
-
+            System.out.print("Invoking: " + method.getName() + "\n");
             if ("asAsync".equals(method.getName()) && noParams) {
                 ServiceProxy<S> asyncProxy = new ServiceProxy<>(serviceClass, id);
                 asyncProxy.mask = mask;
diff --git a/src/main/java/com/softlayer/api/TestApiClient.java b/src/main/java/com/softlayer/api/TestApiClient.java
@@ -0,0 +1,61 @@
+package com.softlayer.api;
+
+import com.softlayer.api.annotation.ApiMethod;
+import com.softlayer.api.annotation.ApiService;
+import com.softlayer.api.http.HttpBasicAuthCredentials;
+import com.softlayer.api.http.HttpClient;
+import com.softlayer.api.http.HttpResponse;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+public class TestApiClient extends RestApiClient{
+
+
+    private HttpBasicAuthCredentials credentials;
+    public HttpBasicAuthCredentials getCredentials() {
+        return credentials;
+    }
+
+    public TestApiClient(String baseUrl) {
+        super(baseUrl);
+    }
+
+    public <S extends Service> S createService(Class<S> serviceClass, String id) {
+        return (S) Proxy.newProxyInstance(getClass().getClassLoader(),
+                new Class<?>[] { serviceClass }, new TestServiceProxy<>(serviceClass, id));
+    }
+
+    class TestServiceProxy<S extends Service> extends ServiceProxy {
+
+        final Class<S> serviceClass;
+        final String id;
+        Mask mask;
+        String maskString;
+        ResultLimit resultLimit;
+        Integer lastResponseTotalItemCount;
+
+        public TestServiceProxy(Class serviceClass, String id) {
+            super(serviceClass, id);
+            this.serviceClass = serviceClass;
+            this.id = id;
+
+        }
+
+        public String invokeService(Method method, final Object[] args) throws Throwable {
+            System.out.print("invokeTESTService: " + method + "\n");
+            ApiMethod methodInfo = method.getAnnotation(ApiMethod.class);
+            // Must have ID if instance is required
+            if (methodInfo.instanceRequired() && id == null) {
+                throw new IllegalStateException("ID is required to invoke " + method);
+            }
+            String methodName = methodInfo.value().isEmpty() ? method.getName() : methodInfo.value();
+            final String httpMethod = getHttpMethodFromMethodName(methodName);
+            String methodId = methodInfo.instanceRequired() ? this.id : null;
+            final String url = getFullUrl(serviceClass.getAnnotation(ApiService.class).value(),
+                    methodName, methodId, resultLimit, mask == null ? maskString : mask.getMask());
+            return url;
+        }
+    }
+}
diff --git a/src/test/java/com/softlayer/api/MaskTest.java b/src/test/java/com/softlayer/api/MaskTest.java
@@ -70,7 +70,7 @@ public void testSetObjectMask() throws Exception {
     }
 
     @Test
-    public void testSetStringMask() throws Exception {
+    public void testSetStringMask() {
         FakeHttpClientFactory http = new FakeHttpClientFactory(200,
                 Collections.emptyMap(), "\"some response\"");
         RestApiClient client = new RestApiClient("http://example.com/")
@@ -104,5 +104,60 @@ public void testMaskRemoval() {
         service.clearMask();
         assertEquals("", service.withMask().toString());
     }
+
+    @Test
+    public void testRecursiveMaskandLocal() {
+        RestApiClient client = new RestApiClient("http://example.com/");
+        TestEntity.Service service = TestEntity.service(client);
+        service.withMask().recursiveProperty().recursiveProperty().baz();
+        service.withMask().recursiveProperty().recursiveProperty().foo();
+        service.withMask().recursiveProperty().date();
+        assertEquals("recursiveProperty[date,recursiveProperty[foo,baz]]",
+                service.withMask().toString());
+    }
+
+    @Test
+    public void testRecursiveMask() {
+        RestApiClient client = new RestApiClient("http://example.com/");
+        TestEntity.Service service = TestEntity.service(client);
+        service.withMask().recursiveProperty().baz();
+        service.withMask().recursiveProperty().foo();
+        service.withMask().recursiveProperty().date();
+
+        assertEquals("recursiveProperty[date,foo,baz]",
+                service.withMask().toString());
+    }
+
+    @Test
+    public void testMultiLevelMask() {
+        RestApiClient client = new RestApiClient("http://example.com/");
+        TestEntity.Service service = TestEntity.service(client);
+        service.withMask().recursiveProperty().baz();
+        service.withMask().recursiveProperty().foo();
+
+        service.withMask().moreChildren().recursiveProperty().baz();
+        service.withMask().moreChildren().date();
+
+        assertEquals("moreChildren[date,recursiveProperty.baz],recursiveProperty[foo,baz]",
+                service.withMask().toString());
+    }
+
+    @Test
+    public void testChangeMaskScope() {
+        RestApiClient client = new TestApiClient("http://example.com/");
+        client.setLoggingEnabled(true);
+        System.out.print("Hello");
+        TestEntity.Service service = TestEntity.service(client);
+        service.withMask().recursiveProperty().baz();
+        service.withMask().recursiveProperty().foo();
+
+        String result = service.getRecursiveProperty();
+        System.out.print(result);
+//        RestApiClient.ServiceProxy serviceProxy = client.createService(TestEntity, 1234);
+//        serviceProxy.invoke(service, service.getRecursiveProperty(),null);
+//        assertEquals("http://example.com/SomeService/1234/someMethod.json?objectMask=someMask%26%26",
+//                client.ServiceProxy.
+//        )
+    }
 }
 
diff --git a/src/test/java/com/softlayer/api/service/TestEntity.java b/src/test/java/com/softlayer/api/service/TestEntity.java
@@ -6,7 +6,9 @@
 import java.util.concurrent.Future;
 
 import com.softlayer.api.ApiClient;
+import com.softlayer.api.Mask;
 import com.softlayer.api.ResponseHandler;
+import com.softlayer.api.ResultLimit;
 import com.softlayer.api.annotation.ApiMethod;
 import com.softlayer.api.annotation.ApiProperty;
 import com.softlayer.api.annotation.ApiService;
@@ -113,6 +115,15 @@ public List<TestEntity> getMoreChildren() {
         return moreChildren;
     }
 
+    @ApiProperty
+    protected List<TestEntity> recursiveProperty;
+
+    public List<TestEntity> getrecursiveProperty() {
+        if (recursiveProperty == null) {
+            recursiveProperty = new ArrayList<TestEntity>();
+        }
+        return recursiveProperty;
+    }
     public Service asService(ApiClient client) {
         return service(client, id);
     }
@@ -141,6 +152,9 @@ public static interface Service extends com.softlayer.api.Service {
         
         @ApiMethod(instanceRequired = true)
         public Void doSomethingNonStatic(GregorianCalendar param1);
+
+        @ApiMethod("getRecursiveProperty")
+        public String getRecursiveProperty();
     }
     
     public static interface ServiceAsync extends com.softlayer.api.ServiceAsync {
@@ -162,7 +176,7 @@ public static interface ServiceAsync extends com.softlayer.api.ServiceAsync {
     public static class Mask extends Entity.Mask {
         
         public Mask foo() {
-            withLocalProperty("bar");
+            withLocalProperty("foo");
             return this;
         }
         
@@ -183,5 +197,83 @@ public Mask child() {
         public Mask moreChildren() {
             return withSubMask("moreChildren", Mask.class);
         }
+
+        public Mask recursiveProperty() {
+            return withSubMask("recursiveProperty", Mask.class);
+        }
+    }
+
+    public class TestService implements Service {
+
+        @Override
+        public ServiceAsync asAsync() {
+            return null;
+        }
+
+        @Override
+        public Mask withNewMask() {
+            return null;
+        }
+
+        @Override
+        public Mask withMask() {
+            return null;
+        }
+
+        @Override
+        public void setMask(com.softlayer.api.Mask mask) {
+
+        }
+
+        @Override
+        public void setMask(String mask) {
+
+        }
+
+        @Override
+        public void clearMask() {
+
+        }
+
+        @Override
+        public void setMask(Mask mask) {
+
+        }
+
+        @Override
+        public String doSomethingStatic(Long param1, TestEntity param2) {
+            return null;
+        }
+
+        @Override
+        public List<TestEntity> fakeName() {
+            return null;
+        }
+
+        @Override
+        public Void doSomethingNonStatic(GregorianCalendar param1) {
+            return null;
+        }
+
+        @Override
+        public String getRecursiveProperty() {
+            System.out.print("This is playing");
+            return "Thats playing to win";
+        }
+
+        @Override
+        public ResultLimit getResultLimit() {
+            return null;
+        }
+
+        @Override
+        public ResultLimit setResultLimit(ResultLimit limit) {
+            return null;
+        }
+
+        @Override
+        public Integer getLastResponseTotalItemCount() {
+            return null;
+        }
     }
 }
