You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2017/09/07 08:42:17 UTC
jclouds git commit: JCLOUDS-1333: Correct JDK 1.8 method overloading
Repository: jclouds
Updated Branches:
refs/heads/master 7f446a638 -> d7d28fe7d
JCLOUDS-1333: Correct JDK 1.8 method overloading
Newer JDK have a different resolution process, likely due to enhanced
target type inference. Found via:
mvn test -Dmaven.compile.source=1.8 -Dmaven.compile.target=1.8
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/d7d28fe7
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/d7d28fe7
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/d7d28fe7
Branch: refs/heads/master
Commit: d7d28fe7d7f9e9136a48f3bd99a68ea667837720
Parents: 7f446a6
Author: Andrew Gaul <ga...@apache.org>
Authored: Tue Sep 5 13:36:47 2017 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Thu Sep 7 01:41:52 2017 -0700
----------------------------------------------------------------------
.../openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java | 5 -----
.../openstack/keystone/v2_0/options/CreateTenantOptions.java | 2 +-
.../openstack/keystone/v2_0/options/CreateUserOptions.java | 2 +-
.../openstack/keystone/v2_0/options/UpdateTenantOptions.java | 2 +-
.../openstack/keystone/v2_0/options/UpdateUserOptions.java | 2 +-
.../nova/v2_0/binders/BindSecurityGroupRuleToJsonPayload.java | 5 -----
.../openstack/nova/v2_0/options/CreateServerOptions.java | 2 +-
7 files changed, 5 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d7d28fe7/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java
index 6dda128..71ef63d 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/binders/BindAuthToJsonPayload.java
@@ -42,11 +42,6 @@ public class BindAuthToJsonPayload extends BindToJsonPayload implements MapBinde
super(jsonBinder);
}
- @Override
- public <R extends HttpRequest> R bindToRequest(R request, Object toBind) {
- throw new IllegalStateException("BindAuthToJsonPayload needs parameters");
- }
-
protected void addCredentialsInArgsOrNull(GeneratedHttpRequest gRequest, Builder<String, Object> builder) {
for (Object arg : Iterables.filter(gRequest.getInvocation().getArgs(), Predicates.notNull())) {
if (arg.getClass().isAnnotationPresent(CredentialType.class)) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d7d28fe7/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java
index 398865f..2827c1b 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java
@@ -88,7 +88,7 @@ public class CreateTenantOptions implements MapBinder {
tenant.description = description;
tenant.enabled = enabled;
- return bindToRequest(request, ImmutableMap.of("tenant", tenant));
+ return bindToRequest(request, (Object) ImmutableMap.of("tenant", tenant));
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d7d28fe7/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
index e2faf07..5d3c84f 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
@@ -101,7 +101,7 @@ public class CreateUserOptions implements MapBinder{
user.tenantId = tenant;
user.enabled = enabled;
- return bindToRequest(request, ImmutableMap.of("user", user));
+ return bindToRequest(request, (Object) ImmutableMap.of("user", user));
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d7d28fe7/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java
index 7e57dec..6b0f260 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java
@@ -86,7 +86,7 @@ public class UpdateTenantOptions implements MapBinder {
tenant.name = name;
tenant.enabled = enabled;
- return bindToRequest(request, ImmutableMap.of("tenant", tenant));
+ return bindToRequest(request, (Object) ImmutableMap.of("tenant", tenant));
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d7d28fe7/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java
index dbc232c..c47e61f 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java
@@ -93,7 +93,7 @@ public class UpdateUserOptions implements MapBinder{
user.password = password;
user.enabled = enabled;
- return bindToRequest(request, ImmutableMap.of("user", user));
+ return bindToRequest(request, (Object) ImmutableMap.of("user", user));
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d7d28fe7/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindSecurityGroupRuleToJsonPayload.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindSecurityGroupRuleToJsonPayload.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindSecurityGroupRuleToJsonPayload.java
index 022ce6c..b7bdacf 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindSecurityGroupRuleToJsonPayload.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/binders/BindSecurityGroupRuleToJsonPayload.java
@@ -44,11 +44,6 @@ public class BindSecurityGroupRuleToJsonPayload extends BindToJsonPayload implem
}
@Override
- public <R extends HttpRequest> R bindToRequest(R request, Object toBind) {
- throw new IllegalStateException("BindCredentialsToJsonPayload needs parameters");
- }
-
- @Override
public <R extends HttpRequest> R bindToRequest(R request, Map<String, Object> postParams) {
Builder<String, Object> payload = ImmutableMap.builder();
payload.putAll(postParams);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d7d28fe7/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java
index 86b2a45..4ea3508 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java
@@ -253,7 +253,7 @@ public class CreateServerOptions implements MapBinder {
server.blockDeviceMappings = blockDeviceMappings;
}
- return bindToRequest(request, ImmutableMap.of("server", server));
+ return bindToRequest(request, (Object) ImmutableMap.of("server", server));
}
private static class NamedThingy extends ForwardingObject {