Repository: jclouds Updated Branches: refs/heads/master d7d28fe7d -> fb584d844
Address BindingToUnqualifiedCommonType warnings Found via error-prone. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/fb584d84 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/fb584d84 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/fb584d84 Branch: refs/heads/master Commit: fb584d844d8304d6ce32c281a51152c6d8770918 Parents: d7d28fe Author: Andrew Gaul <[email protected]> Authored: Thu Sep 7 00:35:35 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Thu Sep 7 07:08:28 2017 -0700 ---------------------------------------------------------------------- apis/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java | 4 +++- .../test/java/org/jclouds/ec2/internal/BaseEC2ApiExpectTest.java | 2 -- .../nova/ec2/internal/BaseNovaEC2RestApiExpectTest.java | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/fb584d84/apis/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java ---------------------------------------------------------------------- diff --git a/apis/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java b/apis/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java index e1f83bc..fcce310 100644 --- a/apis/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java +++ b/apis/chef/src/main/java/org/jclouds/ohai/config/OhaiModule.java @@ -28,6 +28,7 @@ import javax.inject.Named; import javax.inject.Provider; import javax.inject.Singleton; +import org.jclouds.date.TimeStamp; import org.jclouds.domain.JsonBall; import org.jclouds.json.Json; import org.jclouds.ohai.Automatic; @@ -100,7 +101,7 @@ public class OhaiModule extends AbstractModule { private final Provider<Long> timeProvider; @Inject - OhaiTimeProvider(Provider<Long> timeProvider) { + OhaiTimeProvider(@TimeStamp Provider<Long> timeProvider) { this.timeProvider = timeProvider; } @@ -112,6 +113,7 @@ public class OhaiModule extends AbstractModule { } @Provides + @TimeStamp protected final Long provideMillis() { return millis(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/fb584d84/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiExpectTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiExpectTest.java index 574ef6b..7db2fbf 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiExpectTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiExpectTest.java @@ -25,7 +25,6 @@ import org.jclouds.rest.ConfiguresHttpApi; import com.google.common.base.Supplier; import com.google.inject.Module; -import com.google.inject.Provides; import com.google.inject.TypeLiteral; public abstract class BaseEC2ApiExpectTest<T> extends BaseEC2ExpectTest<T> { @@ -54,7 +53,6 @@ public abstract class BaseEC2ApiExpectTest<T> extends BaseEC2ExpectTest<T> { } @Override - @Provides protected String provideTimeStamp(DateService dateService) { return CONSTANT_DATE; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/fb584d84/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestApiExpectTest.java b/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestApiExpectTest.java index 462bd53..6878df9 100644 --- a/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestApiExpectTest.java +++ b/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestApiExpectTest.java @@ -30,7 +30,6 @@ import org.jclouds.rest.ConfiguresHttpApi; import org.jclouds.rest.internal.BaseRestApiExpectTest; import com.google.inject.Module; -import com.google.inject.Provides; public abstract class BaseNovaEC2RestApiExpectTest extends BaseRestApiExpectTest<NovaEC2Api> { protected static final String CONSTANT_DATE = "2012-04-16T15:54:08.897Z"; @@ -58,7 +57,6 @@ public abstract class BaseNovaEC2RestApiExpectTest extends BaseRestApiExpectTest private static final class TestNovaEC2HttpApiModule extends NovaEC2HttpApiModule { @Override - @Provides protected String provideTimeStamp(DateService dateService) { return CONSTANT_DATE; }
