Permalink
Browse files

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

Openstack extensibility fixup
  • Loading branch information...
2 parents 05b15a7 + 1eee03e commit bb37f619655398d038990e5c281b16fc03f0e02f Adrian Cole committed Aug 16, 2012
@@ -68,17 +68,17 @@
* 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();
}
@@ -71,17 +71,17 @@
* @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();
}
@@ -85,7 +85,7 @@ public String getName() {
@Override
public int hashCode() {
- return Objects.hashCode(name);
+ return Objects.hashCode(super.hashCode(), name);
}
@Override

0 comments on commit bb37f61

Please sign in to comment.