From cd0086c92e64c1790f0d914c97974e618a2370e1 Mon Sep 17 00:00:00 2001
From: andreisavu <asavu@apache.org>
Date: Sun, 13 Nov 2011 17:53:16 +0200
Subject: [PATCH] Fix json parsing for ip forwarding rules

---
 .../cloudstack/features/NATAsyncClient.java   |  7 ++-
 .../features/NATAsyncClientTest.java          |  6 +--
 .../ListIPForwardingRulesResponseTest.java    | 50 +++++++++++++++++++
 .../listipforwardingrulesresponse.json        | 17 +++++++
 4 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java
 create mode 100644 sandbox-apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json

diff --git a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java
index 876dd7f3f4..c523274e30 100644
--- a/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java
+++ b/sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATAsyncClient.java
@@ -31,8 +31,10 @@ import org.jclouds.cloudstack.filters.QuerySigner;
 import org.jclouds.cloudstack.options.CreateIPForwardingRuleOptions;
 import org.jclouds.cloudstack.options.ListIPForwardingRulesOptions;
 import org.jclouds.rest.annotations.ExceptionParser;
+import org.jclouds.rest.annotations.OnlyElement;
 import org.jclouds.rest.annotations.QueryParams;
 import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
 import org.jclouds.rest.annotations.Unwrap;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
@@ -56,7 +58,7 @@ public interface NATAsyncClient {
     */
    @GET
    @QueryParams(keys = "command", values = "listIpForwardingRules")
-   @Unwrap(depth = 2)
+   @SelectJson("ipforwardingrule")
    @Consumes(MediaType.APPLICATION_JSON)
    @ExceptionParser(ReturnEmptySetOnNotFoundOr404.class)
    ListenableFuture<Set<IPForwardingRule>> listIPForwardingRules(ListIPForwardingRulesOptions... options);
@@ -66,7 +68,8 @@ public interface NATAsyncClient {
     */
    @GET
    @QueryParams(keys = "command", values = "listIpForwardingRules")
-   @Unwrap(depth = 3, edgeCollection = Set.class)
+   @SelectJson("ipforwardingrule")
+   @OnlyElement
    @Consumes(MediaType.APPLICATION_JSON)
    @ExceptionParser(ReturnNullOnNotFoundOr404.class)
    ListenableFuture<IPForwardingRule> getIPForwardingRule(@QueryParam("id") long id);
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATAsyncClientTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATAsyncClientTest.java
index b7b8367497..415b9f7243 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATAsyncClientTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NATAsyncClientTest.java
@@ -24,6 +24,7 @@ import java.lang.reflect.Method;
 import org.jclouds.cloudstack.options.CreateIPForwardingRuleOptions;
 import org.jclouds.cloudstack.options.ListIPForwardingRulesOptions;
 import org.jclouds.http.HttpRequest;
+import org.jclouds.http.functions.ParseFirstJsonValueNamed;
 import org.jclouds.http.functions.UnwrapOnlyJsonValue;
 import org.jclouds.http.functions.UnwrapOnlyNestedJsonValue;
 import org.jclouds.http.functions.UnwrapOnlyNestedJsonValueInSet;
@@ -53,7 +54,7 @@ public class NATAsyncClientTest extends BaseCloudStackAsyncClientTest<NATAsyncCl
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
-      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyNestedJsonValue.class);
+      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, ReturnEmptySetOnNotFoundOr404.class);
 
@@ -71,7 +72,7 @@ public class NATAsyncClientTest extends BaseCloudStackAsyncClientTest<NATAsyncCl
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
-      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyNestedJsonValue.class);
+      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, ReturnEmptySetOnNotFoundOr404.class);
 
@@ -88,7 +89,6 @@ public class NATAsyncClientTest extends BaseCloudStackAsyncClientTest<NATAsyncCl
       assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
       assertPayloadEquals(httpRequest, null, null, false);
 
-      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyNestedJsonValueInSet.class);
       assertSaxResponseParserClassEquals(method, null);
       assertExceptionParserClassEquals(method, ReturnNullOnNotFoundOr404.class);
 
diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java
new file mode 100644
index 0000000000..5156aae3cd
--- /dev/null
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jclouds.cloudstack.parse;
+
+import com.google.common.collect.ImmutableSet;
+import org.jclouds.cloudstack.domain.IPForwardingRule;
+import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rest.annotations.SelectJson;
+import org.testng.annotations.Test;
+
+import java.util.Set;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "unit")
+public class ListIPForwardingRulesResponseTest extends BaseSetParserTest<IPForwardingRule> {
+
+   @Override
+   public String resource() {
+      return "/listipforwardingrulesresponse.json";
+   }
+
+   @Override
+   @SelectJson("ipforwardingrule")
+   public Set<IPForwardingRule> expected() {
+      return ImmutableSet.<IPForwardingRule> of(
+         IPForwardingRule.builder().id(66).protocol("tcp").startPort(22).endPort(22).virtualMachineId(58)
+            .virtualMachineDisplayName("i-4-58-VM").virtualMachineName("i-4-58-VM")
+            .IPAddressId(15).IPAddress("10.27.27.64").state("Active").build());
+   }
+
+}
diff --git a/sandbox-apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json b/sandbox-apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json
new file mode 100644
index 0000000000..984f6ee4b6
--- /dev/null
+++ b/sandbox-apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json
@@ -0,0 +1,17 @@
+{
+    "listipforwardingrulesresponse": {
+        "count": 1,
+        "ipforwardingrule": [{
+            "id": 66,
+            "protocol": "tcp",
+            "virtualmachineid": 58,
+            "virtualmachinename": "i-4-58-VM",
+            "virtualmachinedisplayname": "i-4-58-VM",
+            "ipaddressid": 15,
+            "ipaddress": "10.27.27.64",
+            "startport": 22,
+            "endport": 22,
+            "state": "Active"
+        }]
+    }
+}