Skip to content

Commit 6934e42

Browse files
committed
more linting fixes
1 parent fc53ba1 commit 6934e42

File tree

4 files changed

+20
-24
lines changed

4 files changed

+20
-24
lines changed

dataproc/src/main/java/CreateClusterWithAutoscaling.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import com.google.cloud.dataproc.v1.InstanceGroupConfig;
5353
import com.google.cloud.dataproc.v1.RegionName;
5454
import com.google.protobuf.Duration;
55-
5655
import java.io.IOException;
5756
import java.util.concurrent.ExecutionException;
5857

@@ -86,8 +85,8 @@ public static void createClusterwithAutoscaling(
8685
// try-with-resources closes the client, but this can also be done manually with the .close()
8786
// method.
8887
try (ClusterControllerClient clusterControllerClient =
89-
ClusterControllerClient.create(clusterControllerSettings);
90-
AutoscalingPolicyServiceClient autoscalingPolicyServiceClient =
88+
ClusterControllerClient.create(clusterControllerSettings);
89+
AutoscalingPolicyServiceClient autoscalingPolicyServiceClient =
9190
AutoscalingPolicyServiceClient.create(autoscalingPolicyServiceSettings)) {
9291

9392
// Create the Autoscaling policy.

dataproc/src/main/java/SubmitHadoopFsJob.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.google.cloud.storage.Blob;
2727
import com.google.cloud.storage.Storage;
2828
import com.google.cloud.storage.StorageOptions;
29-
3029
import java.io.IOException;
3130
import java.util.ArrayList;
3231
import java.util.Arrays;

dataproc/src/test/java/CreateClusterWithAutoscalingTest.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17+
import static junit.framework.TestCase.assertNotNull;
18+
import static org.hamcrest.MatcherAssert.assertThat;
19+
1720
import com.google.api.gax.longrunning.OperationFuture;
1821
import com.google.cloud.dataproc.v1.AutoscalingPolicyName;
1922
import com.google.cloud.dataproc.v1.AutoscalingPolicyServiceClient;
@@ -22,6 +25,11 @@
2225
import com.google.cloud.dataproc.v1.ClusterControllerSettings;
2326
import com.google.cloud.dataproc.v1.ClusterOperationMetadata;
2427
import com.google.protobuf.Empty;
28+
import java.io.ByteArrayOutputStream;
29+
import java.io.IOException;
30+
import java.io.PrintStream;
31+
import java.util.UUID;
32+
import java.util.concurrent.ExecutionException;
2533
import org.hamcrest.CoreMatchers;
2634
import org.junit.After;
2735
import org.junit.Before;
@@ -30,15 +38,6 @@
3038
import org.junit.runner.RunWith;
3139
import org.junit.runners.JUnit4;
3240

33-
import java.io.ByteArrayOutputStream;
34-
import java.io.IOException;
35-
import java.io.PrintStream;
36-
import java.util.UUID;
37-
import java.util.concurrent.ExecutionException;
38-
39-
import static junit.framework.TestCase.assertNotNull;
40-
import static org.hamcrest.MatcherAssert.assertThat;
41-
4241
@RunWith(JUnit4.class)
4342
public class CreateClusterWithAutoscalingTest {
4443

@@ -80,8 +79,8 @@ public void tearDown() throws IOException, InterruptedException, ExecutionExcept
8079
AutoscalingPolicyServiceSettings.newBuilder().setEndpoint(myEndpoint).build();
8180

8281
try (ClusterControllerClient clusterControllerClient =
83-
ClusterControllerClient.create(clusterControllerSettings);
84-
AutoscalingPolicyServiceClient autoscalingPolicyServiceClient =
82+
ClusterControllerClient.create(clusterControllerSettings);
83+
AutoscalingPolicyServiceClient autoscalingPolicyServiceClient =
8584
AutoscalingPolicyServiceClient.create(autoscalingPolicyServiceSettings)) {
8685

8786
OperationFuture<Empty, ClusterOperationMetadata> deleteClusterAsyncRequest =

dataproc/src/test/java/SubmitHadoopFsJobTest.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,20 @@
1414
* limitations under the License.
1515
*/
1616

17+
import static junit.framework.TestCase.assertNotNull;
18+
import static org.hamcrest.MatcherAssert.assertThat;
19+
1720
import com.google.api.gax.longrunning.OperationFuture;
1821
import com.google.cloud.dataproc.v1.Cluster;
1922
import com.google.cloud.dataproc.v1.ClusterControllerClient;
2023
import com.google.cloud.dataproc.v1.ClusterControllerSettings;
2124
import com.google.cloud.dataproc.v1.ClusterOperationMetadata;
2225
import com.google.protobuf.Empty;
26+
import java.io.ByteArrayOutputStream;
27+
import java.io.IOException;
28+
import java.io.PrintStream;
29+
import java.util.UUID;
30+
import java.util.concurrent.ExecutionException;
2331
import org.hamcrest.CoreMatchers;
2432
import org.junit.After;
2533
import org.junit.Before;
@@ -28,15 +36,6 @@
2836
import org.junit.runner.RunWith;
2937
import org.junit.runners.JUnit4;
3038

31-
import java.io.ByteArrayOutputStream;
32-
import java.io.IOException;
33-
import java.io.PrintStream;
34-
import java.util.UUID;
35-
import java.util.concurrent.ExecutionException;
36-
37-
import static junit.framework.TestCase.assertNotNull;
38-
import static org.hamcrest.MatcherAssert.assertThat;
39-
4039
@RunWith(JUnit4.class)
4140
public class SubmitHadoopFsJobTest {
4241

0 commit comments

Comments
 (0)