Repository: jclouds-labs Updated Branches: refs/heads/master 7e2b0582c -> e8e68c400
JCLOUDS-1333: Fix Java 8 and Guava 21 issues Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/e8e68c40 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/e8e68c40 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/e8e68c40 Branch: refs/heads/master Commit: e8e68c4008201d4da48183cadc37858475003adc Parents: 7e2b058 Author: Andrew Gaul <[email protected]> Authored: Sat Apr 14 11:44:08 2018 -0700 Committer: Andrew Gaul <[email protected]> Committed: Sun Apr 15 10:06:17 2018 -0700 ---------------------------------------------------------------------- .../azurecompute/internal/BaseAzureComputeApiMockTest.java | 4 ++-- .../internal/BaseDimensionDataCloudControlApiLiveTest.java | 4 ++-- .../internal/BaseDimensionDataCloudControlMockTest.java | 4 ++-- .../v6_5/compute/predicates/AllNodesInGroupTerminated.java | 4 ++-- .../oneandone/rest/internal/BaseOneAndOneApiMockTest.java | 4 ++-- .../profitbricks/rest/internal/BaseProfitBricksApiMockTest.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e8e68c40/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java index 5a47ca9..ced04f8 100644 --- a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java +++ b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java @@ -17,7 +17,7 @@ package org.jclouds.azurecompute.internal; import static com.google.common.base.Charsets.UTF_8; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; @@ -39,7 +39,7 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest; public class BaseAzureComputeApiMockTest { - private final Set<Module> modules = ImmutableSet.<Module>of(new ExecutorServiceModule(sameThreadExecutor())); + private final Set<Module> modules = ImmutableSet.<Module>of(new ExecutorServiceModule(newDirectExecutorService())); protected String provider; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e8e68c40/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlApiLiveTest.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlApiLiveTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlApiLiveTest.java index cd3e148..1cffc47 100644 --- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlApiLiveTest.java +++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlApiLiveTest.java @@ -40,7 +40,7 @@ import org.testng.annotations.Test; import java.util.Properties; import java.util.Set; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.jclouds.dimensiondata.cloudcontrol.config.DimensionDataCloudControlComputeServiceContextModule.NETWORK_DOMAIN_DELETED_PREDICATE; import static org.jclouds.dimensiondata.cloudcontrol.config.DimensionDataCloudControlComputeServiceContextModule.NETWORK_DOMAIN_NORMAL_PREDICATE; import static org.jclouds.dimensiondata.cloudcontrol.config.DimensionDataCloudControlComputeServiceContextModule.SERVER_DELETED_PREDICATE; @@ -54,7 +54,7 @@ import static org.jclouds.dimensiondata.cloudcontrol.config.DimensionDataCloudCo @Test(groups = "live") public class BaseDimensionDataCloudControlApiLiveTest extends BaseApiLiveTest<DimensionDataCloudControlApi> { - private static final Set<Module> modules = ImmutableSet.<Module>of(new ExecutorServiceModule(sameThreadExecutor())); + private static final Set<Module> modules = ImmutableSet.<Module>of(new ExecutorServiceModule(newDirectExecutorService())); protected static final String PREPARED_CUSTOMER_IMAGE_ID = "fb438e00-10f8-47ac-a434-f3f9461c3a76"; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e8e68c40/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java ---------------------------------------------------------------------- diff --git a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java index 69707b4..c22504c 100644 --- a/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java +++ b/dimensiondata/src/test/java/org/jclouds/dimensiondata/cloudcontrol/internal/BaseDimensionDataCloudControlMockTest.java @@ -46,7 +46,7 @@ import java.util.Properties; import java.util.Set; import static com.google.common.collect.Iterables.size; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.assertj.core.api.Assertions.assertThat; import static org.jclouds.util.Strings2.toStringAndClose; import static org.testng.Assert.assertEquals; @@ -61,7 +61,7 @@ public class BaseDimensionDataCloudControlMockTest implements IHookable { private static final String DEFAULT_ENDPOINT = PROVIDER_METADATA.getEndpoint(); protected static final String VERSION = PROVIDER_METADATA.getApiMetadata().getVersion(); - private final Set<Module> modules = ImmutableSet.<Module>of(new ExecutorServiceModule(sameThreadExecutor())); + private final Set<Module> modules = ImmutableSet.<Module>of(new ExecutorServiceModule(newDirectExecutorService())); protected MockWebServer server; protected DimensionDataCloudControlApi api; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e8e68c40/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/predicates/AllNodesInGroupTerminated.java ---------------------------------------------------------------------- diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/predicates/AllNodesInGroupTerminated.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/predicates/AllNodesInGroupTerminated.java index decea97..d9fc298 100644 --- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/predicates/AllNodesInGroupTerminated.java +++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/predicates/AllNodesInGroupTerminated.java @@ -17,7 +17,6 @@ package org.jclouds.joyent.cloudapi.v6_5.compute.predicates; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Predicates.and; import static com.google.common.collect.Iterables.all; import static org.jclouds.compute.predicates.NodePredicates.TERMINATED; import static org.jclouds.compute.predicates.NodePredicates.inGroup; @@ -29,6 +28,7 @@ import org.jclouds.compute.ComputeService; import org.jclouds.joyent.cloudapi.v6_5.domain.datacenterscoped.DatacenterAndName; import com.google.common.base.Predicate; +import com.google.common.base.Predicates; public class AllNodesInGroupTerminated implements Predicate<DatacenterAndName> { private final ComputeService computeService; @@ -42,6 +42,6 @@ public class AllNodesInGroupTerminated implements Predicate<DatacenterAndName> { @Override public boolean apply(DatacenterAndName input) { - return all(computeService.listNodesDetailsMatching(locationId(input.getDatacenter())), and(inGroup(input.getName()), TERMINATED)); + return all(computeService.listNodesDetailsMatching(locationId(input.getDatacenter())), Predicates.and(inGroup(input.getName()), TERMINATED)); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e8e68c40/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneApiMockTest.java ---------------------------------------------------------------------- diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneApiMockTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneApiMockTest.java index 451f184..30c4683 100644 --- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneApiMockTest.java +++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneApiMockTest.java @@ -20,7 +20,7 @@ import com.google.common.base.Charsets; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; import com.google.common.io.Resources; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import com.google.gson.JsonParser; import com.google.inject.Module; import com.squareup.okhttp.mockwebserver.MockWebServer; @@ -43,7 +43,7 @@ public class BaseOneAndOneApiMockTest { private static final OneAndOneProviderMetadata METADATA = new OneAndOneProviderMetadata(); protected static final String AUTH_HEADER = "token"; private static final String DEFAULT_ENDPOINT = METADATA.getEndpoint(); - private final Set<Module> modules = ImmutableSet.<Module>of(new ExecutorServiceModule(sameThreadExecutor())); + private final Set<Module> modules = ImmutableSet.<Module>of(new ExecutorServiceModule(newDirectExecutorService())); protected MockWebServer server; protected OneAndOneApi api; private Json json; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/e8e68c40/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksApiMockTest.java ---------------------------------------------------------------------- diff --git a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksApiMockTest.java b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksApiMockTest.java index 1258828..f55a10d 100644 --- a/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksApiMockTest.java +++ b/profitbricks-rest/src/test/java/org/apache/jclouds/profitbricks/rest/internal/BaseProfitBricksApiMockTest.java @@ -16,7 +16,7 @@ */ package org.apache.jclouds.profitbricks.rest.internal; -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; +import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService; import static org.testng.Assert.assertEquals; import java.io.IOException; @@ -47,7 +47,7 @@ public class BaseProfitBricksApiMockTest { protected static final String authHeader = BasicAuthentication.basic("username", "password"); private static final String DEFAULT_ENDPOINT = new ProfitBricksProviderMetadata().getEndpoint(); - private final Set<Module> modules = ImmutableSet.<Module>of(new ExecutorServiceModule(sameThreadExecutor())); + private final Set<Module> modules = ImmutableSet.<Module>of(new ExecutorServiceModule(newDirectExecutorService())); protected MockWebServer server; protected ProfitBricksApi api;
