Merge remote-tracking branch 'remotes/upstream/master' into issue-10

cretz · cretz · commit 26acba7f30ce · 2015-02-23T15:20:19.000-06:00
Conflicts:
	src/test/java/com/softlayer/api/RestApiClientTest.java
diff --git a/gen/src/main/java/com/softlayer/api/gen/ClassWriter.java b/gen/src/main/java/com/softlayer/api/gen/ClassWriter.java
@@ -324,9 +324,9 @@ public ClassWriter emitServiceMethod(TypeClass.Property property, boolean async)
             
             // Instance is only required if it's not an account property
             if ("SoftLayer_Account".equals(type.meta.name)) {
-            	emitAnnotation(TYPE_API_METHOD);
+                emitAnnotation(TYPE_API_METHOD);
             } else {
-            	emitAnnotationWithAttrs(TYPE_API_METHOD, "instanceRequired", true);
+                emitAnnotationWithAttrs(TYPE_API_METHOD, "instanceRequired", true);
             }
         } else {
             // Otherwise, just a javadoc link
diff --git a/src/main/java/com/softlayer/api/RestApiClient.java b/src/main/java/com/softlayer/api/RestApiClient.java
@@ -466,10 +466,25 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
                 return invokeService(method, args);
             } else if (ServiceAsync.class.isAssignableFrom(method.getDeclaringClass())) {
                 return invokeServiceAsync(method, args);
+            } else if (method.getDeclaringClass() == Object.class) {
+                return method.invoke(this, args);
             } else {
                 // Should not be possible
                 throw new RuntimeException("Unrecognized method: " + method);
             }
         }
+        
+        @Override
+        public boolean equals(Object obj) {
+            return Proxy.isProxyClass(obj.getClass()) && obj.hashCode() == hashCode();
+        }
+        
+        @Override
+        public String toString() {
+            if (id == null) {
+                return "Service: " + serviceClass.getAnnotation(ApiService.class).value();
+            }
+            return "Service: " + serviceClass.getAnnotation(ApiService.class).value() + " with ID " + id;
+        }
     }
 }
diff --git a/src/test/java/com/softlayer/api/RestApiClientTest.java b/src/test/java/com/softlayer/api/RestApiClientTest.java
@@ -4,6 +4,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import java.lang.reflect.Proxy;
 import java.net.URLEncoder;
 import java.util.Collections;
 import java.util.GregorianCalendar;
@@ -428,7 +429,7 @@ public void onSuccess(String value) {
         assertTrue(http.invokeAsyncCallbackCalled);
         assertTrue(successCalled.get());
     }
-    
+
     @Test(expected = IllegalArgumentException.class)
     public void testMaskMustNotBeNull() {
         RestApiClient client = new RestApiClient("http://example.com/");
@@ -445,4 +446,15 @@ public void testMaskRemoval() {
         service.clearMask();
         assertEquals("", service.withMask().toString());
     }
+
+    @Test
+    public void testNormalObjectMethodsOnService() {
+        RestApiClient client = new RestApiClient("http://example.com/");
+        TestEntity.Service service = TestEntity.service(client);
+        assertEquals("Service: SoftLayer_TestEntity", service.toString());
+        assertEquals("Service: SoftLayer_TestEntity with ID 5", TestEntity.service(client, 5L).toString());
+        assertTrue(Proxy.isProxyClass(service.getClass()));
+        assertEquals(service.hashCode(), service.hashCode());
+        assertTrue(service.equals(service));
+    }
 }
diff --git a/src/test/java/com/softlayer/api/json/GsonJsonMarshallerFactoryTest.java b/src/test/java/com/softlayer/api/json/GsonJsonMarshallerFactoryTest.java
@@ -105,8 +105,8 @@ public void testWrite() throws Exception {
         expected.put("baz", null);
         int offsetMinutes = TimeZone.getDefault().getOffset(obj.getDate().getTimeInMillis()) / 60000;
         String expectedTimeZone =
-    		(offsetMinutes < 0 ? '-' : '+') +
-    		String.format("%1$02d:%2$02d", Math.abs(offsetMinutes / 60), Math.abs(offsetMinutes % 60));
+            (offsetMinutes < 0 ? '-' : '+') +
+            String.format("%1$02d:%2$02d", Math.abs(offsetMinutes / 60), Math.abs(offsetMinutes % 60));
         expected.put("date", "1984-02-25T20:15:25" + expectedTimeZone);
         Map<String, Object> childMap = new HashMap<String, Object>();
         childMap.put("complexType", "SoftLayer_TestEntity");
