You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by jd...@apache.org on 2014/09/04 18:34:16 UTC
git commit: Updated api-version and removed upper bounds wildcards
for extension APIs
Repository: jclouds
Updated Branches:
refs/heads/master 808bef333 -> 398e8e30a
Updated api-version and removed upper bounds wildcards for extension APIs
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/398e8e30
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/398e8e30
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/398e8e30
Branch: refs/heads/master
Commit: 398e8e30a4f4ffb0f03352c08a26a7c0e7589f1f
Parents: 808bef3
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Wed Sep 3 11:05:52 2014 -0700
Committer: Jeremy Daggett <jd...@apache.org>
Committed: Thu Sep 4 09:33:58 2014 -0700
----------------------------------------------------------------------
apis/openstack-nova/pom.xml | 4 +--
.../jclouds/openstack/nova/v2_0/NovaApi.java | 32 ++++++++++----------
2 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/398e8e30/apis/openstack-nova/pom.xml
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/pom.xml b/apis/openstack-nova/pom.xml
index 96bd580..75a8095 100644
--- a/apis/openstack-nova/pom.xml
+++ b/apis/openstack-nova/pom.xml
@@ -35,7 +35,7 @@
<!-- keystone endpoint -->
<test.openstack-nova.endpoint>http://localhost:5000/v2.0/</test.openstack-nova.endpoint>
<!-- keystone version -->
- <test.openstack-nova.api-version>1.1</test.openstack-nova.api-version>
+ <test.openstack-nova.api-version>2</test.openstack-nova.api-version>
<test.openstack-nova.build-version />
<test.openstack-nova.identity>FIXME_IDENTITY</test.openstack-nova.identity>
<test.openstack-nova.credential>FIXME_CREDENTIALS</test.openstack-nova.credential>
@@ -114,7 +114,7 @@
</exclusions>
</dependency>
</dependencies>
-
+
<profiles>
<profile>
<id>live</id>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/398e8e30/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java
index ecedb32..7839612 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java
@@ -93,7 +93,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends AvailabilityZoneApi> getAvailabilityZoneApi(
+ Optional<AvailabilityZoneApi> getAvailabilityZoneApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -104,7 +104,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends FloatingIPApi> getFloatingIPApi(
+ Optional<FloatingIPApi> getFloatingIPApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -115,7 +115,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends SecurityGroupApi> getSecurityGroupApi(
+ Optional<SecurityGroupApi> getSecurityGroupApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -126,7 +126,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends KeyPairApi> getKeyPairApi(
+ Optional<KeyPairApi> getKeyPairApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -137,7 +137,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends HostAdministrationApi> getHostAdministrationApi(
+ Optional<HostAdministrationApi> getHostAdministrationApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -148,7 +148,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends SimpleTenantUsageApi> getSimpleTenantUsageApi(
+ Optional<SimpleTenantUsageApi> getSimpleTenantUsageApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -159,7 +159,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends VirtualInterfaceApi> getVirtualInterfaceApi(
+ Optional<VirtualInterfaceApi> getVirtualInterfaceApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -170,7 +170,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends ServerWithSecurityGroupsApi> getServerWithSecurityGroupsApi(
+ Optional<ServerWithSecurityGroupsApi> getServerWithSecurityGroupsApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -181,7 +181,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends ServerAdminApi> getServerAdminApi(
+ Optional<ServerAdminApi> getServerAdminApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -192,7 +192,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends HostAggregateApi> getHostAggregateApi(
+ Optional<HostAggregateApi> getHostAggregateApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -203,7 +203,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends FlavorExtraSpecsApi> getFlavorExtraSpecsApi(
+ Optional<FlavorExtraSpecsApi> getFlavorExtraSpecsApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -214,7 +214,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends QuotaApi> getQuotaApi(
+ Optional<QuotaApi> getQuotaApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -225,7 +225,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends VolumeApi> getVolumeApi(
+ Optional<VolumeApi> getVolumeApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -236,7 +236,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends VolumeAttachmentApi> getVolumeAttachmentApi(
+ Optional<VolumeAttachmentApi> getVolumeAttachmentApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -247,7 +247,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends VolumeTypeApi> getVolumeTypeApi(
+ Optional<VolumeTypeApi> getVolumeTypeApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**
@@ -258,7 +258,7 @@ public interface NovaApi extends Closeable {
* to determine if it is present.
*/
@Delegate
- Optional<? extends ConsolesApi> getConsolesApi(
+ Optional<ConsolesApi> getConsolesApi(
@EndpointParam(parser = RegionToEndpoint.class) String region);
/**