Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #788 from grkvlt/openstack-extensibility-fixup 

Openstack extensibility fixup
This commit is contained in:
Adrian Cole 2012-08-16 14:56:40 -07:00
parent 05b15a7302 1eee03ee1f
commit bb37f61965
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java
View File

@ -68,17 +68,17 @@ public interface KeystoneApi {
* Provides synchronous access to Token features
*/
@Delegate
Optional<TokenApi> getTokenApi();
Optional<? extends TokenApi> getTokenApi();
/**
* Provides synchronous access to User features
*/
@Delegate
Optional<UserApi> getUserApi();
Optional<? extends UserApi> getUserApi();
/**
* Provides synchronous access to Tenant features
*/
@Delegate
Optional<TenantApi> getTenantApi();
Optional<? extends TenantApi> getTenantApi();
}

6
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneAsyncApi.java
View File

@ -71,17 +71,17 @@ public interface KeystoneAsyncApi {
* @see KeystoneApi#getTokenApi()
*/
@Delegate
Optional<TokenAsyncApi> getTokenApi();
Optional<? extends TokenAsyncApi> getTokenApi();
/**
* @see KeystoneApi#getUserApi()
*/
@Delegate
Optional<UserAsyncApi> getUserApi();
Optional<? extends UserAsyncApi> getUserApi();
/**
* @see KeystoneApi#getTenantApi()
*/
@Delegate
Optional<TenantAsyncApi> getTenantApi();
Optional<? extends TenantAsyncApi> getTenantApi();
}

2
labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/domain/Network.java
View File

@ -85,7 +85,7 @@ public class Network extends Reference {
@Override
public int hashCode() {
return Objects.hashCode(name);
return Objects.hashCode(super.hashCode(), name);
}
@Override