Updated Branches: refs/heads/1.6.x 264d47e3c -> 35a44243a
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java index 92cfcbc..bdc50ff 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java @@ -41,11 +41,13 @@ import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to CloudStack SSHKeyPair features. * + * @deprecated The async interface will be removed in jclouds 1.7. * @author Vijay Kiran * @see <a * href="http://download.cloud.com/releases/2.2.0/api_2.2.8/TOC_User.html"; * /> */ +@Deprecated @RequestFilters(AuthenticationFilter.class) @QueryParams(keys = "response", values = "json") public interface SSHKeyPairAsyncClient { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairClient.java index 2a3871a..a81a825 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairClient.java @@ -23,11 +23,13 @@ import org.jclouds.cloudstack.options.ListSSHKeyPairsOptions; /** * Provides synchronous access to CloudStack SSHKeyPair features. * + * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7. * @author Vijay Kiran * @see <a * href="http://download.cloud.com/releases/2.2.0/api_2.2.8/TOC_User.html"; * /> */ +@Deprecated public interface SSHKeyPairClient { /** * Returns a list of {@link SshKeyPair}s registered by current user. http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java new file mode 100644 index 0000000..42a3315 --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupApi.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; +import org.jclouds.cloudstack.domain.SecurityGroup; + +/** + * Provides synchronous access to CloudStack Account features. + * <p/> + * + * Note that this class is transitionary and will fully replace SecurityGroupClient in 1.7. + * + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +public interface SecurityGroupApi extends SecurityGroupClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncApi.java new file mode 100644 index 0000000..4bf70b5 --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncApi.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; + +import javax.inject.Named; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.cloudstack.domain.SecurityGroup; +import org.jclouds.cloudstack.filters.AuthenticationFilter; +import org.jclouds.rest.annotations.Fallback; +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 com.google.common.util.concurrent.ListenableFuture; + +/** + * Provides asynchronous access to cloudstack via their REST API. + * <p/> + * + * @deprecated This class will be removed in 1.7. + * @see SecurityGroupApi + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +@Deprecated +@RequestFilters(AuthenticationFilter.class) +@QueryParams(keys = "response", values = "json") +public interface SecurityGroupAsyncApi extends SecurityGroupAsyncClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClient.java index 283ff5b..391d7c0 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupAsyncClient.java @@ -47,10 +47,12 @@ import com.google.common.util.concurrent.ListenableFuture; * Provides asynchronous access to cloudstack via their REST API. * <p/> * + * @deprecated The async interface will be removed in jclouds 1.7. * @see OfferingClient * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> * @author Adrian Cole */ +@Deprecated @RequestFilters(AuthenticationFilter.class) @QueryParams(keys = "response", values = "json") public interface SecurityGroupAsyncClient { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupClient.java index ddb9422..6cd5194 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupClient.java @@ -27,10 +27,12 @@ import com.google.common.collect.Multimap; * Provides synchronous access to CloudStack security group features. * <p/> * + * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7. * @see SecurityGroupAsyncClient * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> * @author Adrian Cole */ +@Deprecated public interface SecurityGroupClient { /** * Lists security groups http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionApi.java new file mode 100644 index 0000000..0477c80 --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionApi.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; + +/** + * Provides synchronous access to CloudStack Session features. + * <p/> + * + * Note that this class is transitionary and will fully replace SessionClient in 1.7. + * + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +public interface SessionApi extends SessionClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionAsyncApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionAsyncApi.java new file mode 100644 index 0000000..76fa6bf --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionAsyncApi.java @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; + +import javax.inject.Named; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.cloudstack.filters.AuthenticationFilter; +import org.jclouds.rest.annotations.Fallback; +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 com.google.common.util.concurrent.ListenableFuture; + +/** + * Provides asynchronous access to cloudstack via their REST API. + * <p/> + * + * @deprecated This class will be removed in 1.7. + * @see SessionApi + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +@Deprecated +@QueryParams(keys = "response", values = "json") +public interface SessionAsyncApi extends SessionAsyncClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionAsyncClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionAsyncClient.java index 80d02f3..78e7a75 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionAsyncClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionAsyncClient.java @@ -36,10 +36,12 @@ import com.google.common.util.concurrent.ListenableFuture; * Provides asynchronous access to Cloudstack Sessions * <p/> * + * @deprecated The async interface will be removed in jclouds 1.7. * @see org.jclouds.cloudstack.features.SessionClient * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> * @author Andrei Savu */ +@Deprecated @QueryParams(keys = "response", values = "json") public interface SessionAsyncClient { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionClient.java index 2ae3802..d3b9f3b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionClient.java @@ -22,9 +22,11 @@ import org.jclouds.cloudstack.domain.LoginResponse; * Provides synchronous access to CloudStack Sessions * <p/> * + * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7. * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> * @author Andrei Savu */ +@Deprecated public interface SessionClient { /** http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java new file mode 100644 index 0000000..c5b4ae1 --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotApi.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; +import org.jclouds.cloudstack.domain.Snapshot; + +/** + * Provides synchronous access to CloudStack Account features. + * <p/> + * + * Note that this class is transitionary and will fully replace SnapshotClient in 1.7. + * + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +public interface SnapshotApi extends SnapshotClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncApi.java new file mode 100644 index 0000000..895509a --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncApi.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; + +import javax.inject.Named; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.cloudstack.domain.Snapshot; +import org.jclouds.cloudstack.filters.AuthenticationFilter; +import org.jclouds.rest.annotations.Fallback; +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 com.google.common.util.concurrent.ListenableFuture; + +/** + * Provides asynchronous access to cloudstack via their REST API. + * <p/> + * + * @deprecated This class will be removed in 1.7. + * @see SnapshotApi + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +@Deprecated +@RequestFilters(AuthenticationFilter.class) +@QueryParams(keys = "response", values = "json") +public interface SnapshotAsyncApi extends SnapshotAsyncClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java index eedf050..8fd423b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java @@ -51,10 +51,12 @@ import com.google.common.util.concurrent.ListenableFuture; * Provides synchronous access to CloudStack Snapshot features. * <p/> * + * @deprecated The async interface will be removed in jclouds 1.7. * @see SnapshotClient * @see http://download.cloud.com/releases/2.2.0/api/TOC_User.html * @author Richard Downer */ +@Deprecated @RequestFilters(AuthenticationFilter.class) @QueryParams(keys = "response", values = "json") public interface SnapshotAsyncClient { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java index 4b17e2e..c3945f4 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java @@ -29,10 +29,12 @@ import org.jclouds.cloudstack.options.ListSnapshotsOptions; * Provides synchronous access to CloudStack Snapshot features. * <p/> * + * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7. * @see SnapshotAsyncClient * @see http://download.cloud.com/releases/2.2.0/api/TOC_User.html * @author Richard Downer */ +@Deprecated public interface SnapshotClient { /** http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java new file mode 100644 index 0000000..747feb9 --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateApi.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; +import org.jclouds.cloudstack.domain.Template; + +/** + * Provides synchronous access to CloudStack Account features. + * <p/> + * + * Note that this class is transitionary and will fully replace TemplateClient in 1.7. + * + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +public interface TemplateApi extends TemplateClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncApi.java new file mode 100644 index 0000000..479cf05 --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncApi.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; + +import javax.inject.Named; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.cloudstack.domain.Template; +import org.jclouds.cloudstack.filters.AuthenticationFilter; +import org.jclouds.rest.annotations.Fallback; +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 com.google.common.util.concurrent.ListenableFuture; + +/** + * Provides asynchronous access to cloudstack via their REST API. + * <p/> + * + * @deprecated This class will be removed in 1.7. + * @see TemplateApi + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +@Deprecated +@RequestFilters(AuthenticationFilter.class) +@QueryParams(keys = "response", values = "json") +public interface TemplateAsyncApi extends TemplateAsyncClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java index 767889c..70ba2af 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateAsyncClient.java @@ -55,12 +55,14 @@ import com.google.common.util.concurrent.ListenableFuture; * Provides asynchronous access to cloudstack via their REST API. * <p/> * + * @deprecated The async interface will be removed in jclouds 1.7. * @see TemplateClient * @see <a * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; * /> * @author Adrian Cole */ +@Deprecated @RequestFilters(AuthenticationFilter.class) @QueryParams(keys = "response", values = "json") public interface TemplateAsyncClient { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java index 14db6ab..795ee03 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java @@ -35,12 +35,14 @@ import org.jclouds.cloudstack.options.UpdateTemplatePermissionsOptions; * Provides synchronous access to CloudStack template features. * <p/> * + * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7. * @see TemplateAsyncClient * @see <a * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; * /> * @author Adrian Cole */ +@Deprecated public interface TemplateClient { /** * Creates a template of a virtual machine. The virtual machine must be in a http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java new file mode 100644 index 0000000..9ca62f8 --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupApi.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; +import org.jclouds.cloudstack.domain.VMGroup; + +/** + * Provides synchronous access to CloudStack Account features. + * <p/> + * + * Note that this class is transitionary and will fully replace VMGroupClient in 1.7. + * + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +public interface VMGroupApi extends VMGroupClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncApi.java new file mode 100644 index 0000000..b6b11c3 --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncApi.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; + +import javax.inject.Named; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.cloudstack.domain.VMGroup; +import org.jclouds.cloudstack.filters.AuthenticationFilter; +import org.jclouds.rest.annotations.Fallback; +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 com.google.common.util.concurrent.ListenableFuture; + +/** + * Provides asynchronous access to cloudstack via their REST API. + * <p/> + * + * @deprecated This class will be removed in 1.7. + * @see VMGroupApi + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +@Deprecated +@RequestFilters(AuthenticationFilter.class) +@QueryParams(keys = "response", values = "json") +public interface VMGroupAsyncApi extends VMGroupAsyncClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java index 7a70393..a65b313 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java @@ -44,10 +44,12 @@ import com.google.common.util.concurrent.ListenableFuture; * Provides asynchronous access to CloudStack VM group features. * <p/> * + * @deprecated The async interface will be removed in jclouds 1.7. * @author Richard Downer * @see VMGroupClient * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> */ +@Deprecated @RequestFilters(AuthenticationFilter.class) @QueryParams(keys = "response", values = "json") public interface VMGroupAsyncClient { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java index 8dffacd..bd4c76c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java @@ -26,10 +26,12 @@ import org.jclouds.cloudstack.options.UpdateVMGroupOptions; * Provides synchronous access to CloudStack VM group features. * <p/> * + * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7. * @author Richard Downer * @see VMGroupAsyncClient * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> */ +@Deprecated public interface VMGroupClient { /** * Lists VM groups http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java new file mode 100644 index 0000000..5250dad --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineApi.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; +import org.jclouds.cloudstack.domain.VirtualMachine; + +/** + * Provides synchronous access to CloudStack Account features. + * <p/> + * + * Note that this class is transitionary and will fully replace VirtualMachineClient in 1.7. + * + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +public interface VirtualMachineApi extends VirtualMachineClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncApi.java new file mode 100644 index 0000000..3f6fab4 --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncApi.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; + +import javax.inject.Named; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.cloudstack.domain.VirtualMachine; +import org.jclouds.cloudstack.filters.AuthenticationFilter; +import org.jclouds.rest.annotations.Fallback; +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 com.google.common.util.concurrent.ListenableFuture; + +/** + * Provides asynchronous access to cloudstack via their REST API. + * <p/> + * + * @deprecated This class will be removed in 1.7. + * @see VirtualMachineApi + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +@Deprecated +@RequestFilters(AuthenticationFilter.class) +@QueryParams(keys = "response", values = "json") +public interface VirtualMachineAsyncApi extends VirtualMachineAsyncClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java index 5f1aab2..b8918c0 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java @@ -45,10 +45,12 @@ import com.google.common.util.concurrent.ListenableFuture; * Provides asynchronous access to cloudstack via their REST API. * <p/> * + * @deprecated The async interface will be removed in jclouds 1.7. * @see VirtualMachineClient * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> * @author Adrian Cole */ +@Deprecated @RequestFilters(AuthenticationFilter.class) @QueryParams(keys = "response", values = "json") public interface VirtualMachineAsyncClient { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java index 00f20aa..a597fc2 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java @@ -28,10 +28,12 @@ import org.jclouds.cloudstack.options.StopVirtualMachineOptions; * Provides synchronous access to CloudStack VirtualMachine features. * <p/> * + * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7. * @see VirtualMachineAsyncClient * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> * @author Adrian Cole */ +@Deprecated public interface VirtualMachineClient { /** * Lists VirtualMachines http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java new file mode 100644 index 0000000..91d5f70 --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeApi.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; +import org.jclouds.cloudstack.domain.Volume; + +/** + * Provides synchronous access to CloudStack Account features. + * <p/> + * + * Note that this class is transitionary and will fully replace VolumeClient in 1.7. + * + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +public interface VolumeApi extends VolumeClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeAsyncApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeAsyncApi.java new file mode 100644 index 0000000..0e45a04 --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeAsyncApi.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; + +import javax.inject.Named; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.cloudstack.domain.Volume; +import org.jclouds.cloudstack.filters.AuthenticationFilter; +import org.jclouds.rest.annotations.Fallback; +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 com.google.common.util.concurrent.ListenableFuture; + +/** + * Provides asynchronous access to cloudstack via their REST API. + * <p/> + * + * @deprecated This class will be removed in 1.7. + * @see VolumeApi + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +@Deprecated +@RequestFilters(AuthenticationFilter.class) +@QueryParams(keys = "response", values = "json") +public interface VolumeAsyncApi extends VolumeAsyncClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeAsyncClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeAsyncClient.java index 64f2eef..f765b24 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeAsyncClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeAsyncClient.java @@ -44,10 +44,12 @@ import com.google.common.util.concurrent.ListenableFuture; * Provides asynchronous access to cloudstack via their REST API. * <p/> * + * @deprecated The async interface will be removed in jclouds 1.7. * @author Vijay Kiran * @see org.jclouds.cloudstack.features.VolumeClient * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> */ +@Deprecated @RequestFilters(AuthenticationFilter.class) @QueryParams(keys = "response", values = "json") public interface VolumeAsyncClient { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeClient.java index 4f6894b..57492c5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeClient.java @@ -25,9 +25,11 @@ import org.jclouds.cloudstack.options.ListVolumesOptions; * Provides synchronous access to CloudStack Event features. * <p/> * + * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7. * @author Vijay Kiran * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> */ +@Deprecated public interface VolumeClient { /** http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java new file mode 100644 index 0000000..9ab5fda --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneApi.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; +import org.jclouds.cloudstack.domain.Zone; + +/** + * Provides synchronous access to CloudStack Account features. + * <p/> + * + * Note that this class is transitionary and will fully replace ZoneClient in 1.7. + * + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +public interface ZoneApi extends ZoneClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncApi.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncApi.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncApi.java new file mode 100644 index 0000000..7a4c5b4 --- /dev/null +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncApi.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF 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.features; + +import java.util.Set; + +import javax.inject.Named; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; + +import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; +import org.jclouds.Fallbacks.NullOnNotFoundOr404; +import org.jclouds.cloudstack.domain.Zone; +import org.jclouds.cloudstack.filters.AuthenticationFilter; +import org.jclouds.rest.annotations.Fallback; +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 com.google.common.util.concurrent.ListenableFuture; + +/** + * Provides asynchronous access to cloudstack via their REST API. + * <p/> + * + * @deprecated This class will be removed in 1.7. + * @see ZoneApi + * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> + * @author Adrian Cole + */ +@Deprecated +@RequestFilters(AuthenticationFilter.class) +@QueryParams(keys = "response", values = "json") +public interface ZoneAsyncApi extends ZoneAsyncClient { + +} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncClient.java index 8ba69c3..bd79189 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneAsyncClient.java @@ -41,10 +41,12 @@ import com.google.common.util.concurrent.ListenableFuture; * Provides asynchronous access to cloudstack via their REST API. * <p/> * + * @deprecated The async interface will be removed in jclouds 1.7. * @see ZoneClient * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> * @author Adrian Cole */ +@Deprecated @RequestFilters(AuthenticationFilter.class) @QueryParams(keys = "response", values = "json") public interface ZoneAsyncClient { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/35a44243/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneClient.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneClient.java index 89cbed4..2d0df70 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneClient.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneClient.java @@ -24,10 +24,12 @@ import org.jclouds.cloudstack.options.ListZonesOptions; * Provides synchronous access to CloudStack zone features. * <p/> * + * @deprecated The *Client classes will be replaced with the *Api classes in jclouds 1.7. * @see ZoneAsyncClient * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"; /> * @author Adrian Cole */ +@Deprecated public interface ZoneClient { /** * Lists zones
