You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/06/28 19:25:07 UTC
[8/12] git commit: Fixed @Implementation for the api commands -
responseObject field should be the instance of BaseResponse
Fixed @Implementation for the api commands - responseObject field should be the instance of BaseResponse
Conflicts:
api/src/com/cloud/api/commands/UpdateStorageNetworkIpRangeCmd.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/fcdf6f2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fcdf6f2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fcdf6f2b
Branch: refs/heads/vpc
Commit: fcdf6f2bec720bcffbcdf61d3136bbdbb4c2e46d
Parents: 42dac79
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Jun 26 16:22:39 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Thu Jun 28 10:15:43 2012 -0700
----------------------------------------------------------------------
api/src/com/cloud/api/Implementation.java | 4 +++-
.../commands/UpdateStorageNetworkIpRangeCmd.java | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fcdf6f2b/api/src/com/cloud/api/Implementation.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/Implementation.java b/api/src/com/cloud/api/Implementation.java
index ba7a556..6f0b965 100644
--- a/api/src/com/cloud/api/Implementation.java
+++ b/api/src/com/cloud/api/Implementation.java
@@ -22,10 +22,12 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import com.cloud.api.response.BaseResponse;
+
@Retention(RetentionPolicy.RUNTIME)
@Target({ TYPE })
public @interface Implementation {
- Class<?> responseObject();
+ Class<? extends BaseResponse> responseObject();
String description() default "";
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/fcdf6f2b/api/src/com/cloud/api/commands/UpdateStorageNetworkIpRangeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/UpdateStorageNetworkIpRangeCmd.java b/api/src/com/cloud/api/commands/UpdateStorageNetworkIpRangeCmd.java
index ff438fb..7e0b05b 100755
--- a/api/src/com/cloud/api/commands/UpdateStorageNetworkIpRangeCmd.java
+++ b/api/src/com/cloud/api/commands/UpdateStorageNetworkIpRangeCmd.java
@@ -34,7 +34,7 @@ import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
-@Implementation(description="Update a Storage network IP range, only allowed when no IPs in this range have been allocated.", responseObject=UpdateStorageNetworkIpRangeCmd.class, since="3.0.0")
+@Implementation(description="Update a Storage network IP range, only allowed when no IPs in this range have been allocated.", responseObject=StorageNetworkIpRangeResponse.class, since="3.0.0")
public class UpdateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpdateStorageNetworkIpRangeCmd.class);
private static final String s_name = "updatestoragenetworkiprangeresponse";
@@ -117,3 +117,4 @@ public class UpdateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
}
}
+