Skip to content

Commit 287fe50

Browse files
abstractdogabstractdog
committed
TEZ-4642: Introduce spotless plugin and enforce basic import styles
1 parent adf258b commit 287fe50

File tree

638 files changed

+3800
-3369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

638 files changed

+3800
-3369
lines changed

‎hadoop-shim-impls/hadoop-shim-2.8/src/test/java/org/apache/tez/hadoop/shim/TestHadoopShim28.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.apache.tez.hadoop.shim;
2020

2121
import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
22+
2223
import org.junit.Assert;
2324
import org.junit.Test;
2425

‎hadoop-shim-impls/hadoop-shim-2.8/src/test/java/org/apache/tez/hadoop/shim/TestHadoopShim28Provider.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.apache.tez.hadoop.shim;
2020

2121
import org.apache.hadoop.conf.Configuration;
22+
2223
import org.junit.Assert;
2324
import org.junit.Test;
2425

‎hadoop-shim/src/main/java/org/apache/tez/hadoop/shim/HadoopShimsLoader.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424
import org.apache.hadoop.classification.InterfaceAudience.Private;
2525
import org.apache.hadoop.conf.Configuration;
2626
import org.apache.hadoop.util.VersionInfo;
27-
import org.slf4j.Logger;
28-
import org.slf4j.LoggerFactory;
2927

3028
import com.google.common.annotations.VisibleForTesting;
3129

30+
import org.slf4j.Logger;
31+
import org.slf4j.LoggerFactory;
32+
3233
@Private
3334
public class HadoopShimsLoader {
3435

‎hadoop-shim/src/test/java/org/apache/tez/hadoop/shim/TestHadoopShimsLoader.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import org.apache.hadoop.conf.Configuration;
2222
import org.apache.tez.hadoop.shim.DummyShimProvider.DummyShim;
23+
2324
import org.junit.Assert;
2425
import org.junit.Test;
2526

‎pom.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,20 @@
994994
<failOnError>false</failOnError>
995995
</configuration>
996996
</plugin>
997+
<plugin>
998+
<groupId>com.diffplug.spotless</groupId>
999+
<artifactId>spotless-maven-plugin</artifactId>
1000+
<version>2.43.0</version>
1001+
<configuration>
1002+
<failOnViolation>true</failOnViolation>
1003+
<java>
1004+
<importOrder>
1005+
<order>java,javax,org.apache,com,net,io</order>
1006+
</importOrder>
1007+
<removeUnusedImports/>
1008+
</java>
1009+
</configuration>
1010+
</plugin>
9971011
<plugin>
9981012
<groupId>org.codehaus.mojo</groupId>
9991013
<artifactId>build-helper-maven-plugin</artifactId>
@@ -1146,6 +1160,19 @@
11461160
<failOnError>false</failOnError>
11471161
</configuration>
11481162
</plugin>
1163+
<plugin>
1164+
<groupId>com.diffplug.spotless</groupId>
1165+
<artifactId>spotless-maven-plugin</artifactId>
1166+
<executions>
1167+
<execution>
1168+
<id>spotless-check</id>
1169+
<phase>validate</phase>
1170+
<goals>
1171+
<goal>check</goal>
1172+
</goals>
1173+
</execution>
1174+
</executions>
1175+
</plugin>
11491176
<plugin>
11501177
<!-- OWASP's dependency-check plugin will scan the third party
11511178
dependencies of this project for known CVEs (security

‎tez-api/src/main/java/org/apache/tez/client/CallerContext.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.apache.hadoop.classification.InterfaceAudience.Private;
2424
import org.apache.hadoop.classification.InterfaceAudience.Public;
2525
import org.apache.hadoop.classification.InterfaceStability.Unstable;
26-
2726
import org.apache.tez.common.Preconditions;
2827

2928
@Public

‎tez-api/src/main/java/org/apache/tez/client/FrameworkClient.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,12 @@
4646
import org.apache.tez.dag.api.client.rpc.DAGClientAMProtocolRPC.ShutdownSessionRequestProto;
4747
import org.apache.tez.dag.api.client.rpc.DAGClientAMProtocolRPC.SubmitDAGRequestProto;
4848
import org.apache.tez.dag.api.client.rpc.DAGClientAMProtocolRPC.SubmitDAGResponseProto;
49-
import org.slf4j.Logger;
50-
import org.slf4j.LoggerFactory;
5149

5250
import com.google.protobuf.ServiceException;
5351

52+
import org.slf4j.Logger;
53+
import org.slf4j.LoggerFactory;
54+
5455
@Private
5556
public abstract class FrameworkClient {
5657
protected static final Logger LOG = LoggerFactory.getLogger(FrameworkClient.class);

‎tez-api/src/main/java/org/apache/tez/client/TezClient.java‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,29 @@
2222
import java.net.InetAddress;
2323
import java.net.UnknownHostException;
2424
import java.text.NumberFormat;
25+
import java.util.HashMap;
26+
import java.util.Map;
27+
import java.util.Objects;
2528
import java.util.concurrent.Executors;
2629
import java.util.concurrent.ScheduledExecutorService;
30+
import java.util.concurrent.TimeUnit;
2731
import java.util.concurrent.atomic.AtomicBoolean;
2832
import java.util.concurrent.atomic.AtomicInteger;
29-
import java.util.concurrent.TimeUnit;
30-
import java.util.HashMap;
31-
import java.util.Map;
32-
import java.util.Objects;
3333

3434
import javax.annotation.Nullable;
3535

36+
import org.apache.hadoop.classification.InterfaceAudience.Private;
37+
import org.apache.hadoop.classification.InterfaceAudience.Public;
38+
import org.apache.hadoop.classification.InterfaceStability.Evolving;
39+
import org.apache.hadoop.classification.InterfaceStability.Unstable;
3640
import org.apache.hadoop.conf.Configuration;
3741
import org.apache.hadoop.fs.CommonConfigurationKeys;
3842
import org.apache.hadoop.fs.FSDataOutputStream;
3943
import org.apache.hadoop.fs.FileSystem;
4044
import org.apache.hadoop.fs.Path;
41-
import org.apache.hadoop.security.UserGroupInformation;
42-
import org.apache.tez.common.JavaOptsChecker;
43-
import org.apache.tez.common.TezCommonUtils;
44-
import org.apache.tez.common.counters.Limits;
45-
import org.apache.tez.dag.api.TezConfigurationConstants;
46-
import org.apache.tez.serviceplugins.api.ServicePluginsDescriptor;
47-
import org.slf4j.Logger;
48-
import org.slf4j.LoggerFactory;
49-
import org.apache.hadoop.classification.InterfaceAudience.Private;
50-
import org.apache.hadoop.classification.InterfaceAudience.Public;
51-
import org.apache.hadoop.classification.InterfaceStability.Evolving;
52-
import org.apache.hadoop.classification.InterfaceStability.Unstable;
5345
import org.apache.hadoop.security.Credentials;
46+
import org.apache.hadoop.security.UserGroupInformation;
47+
import org.apache.hadoop.util.Time;
5448
import org.apache.hadoop.yarn.api.records.ApplicationId;
5549
import org.apache.hadoop.yarn.api.records.ApplicationReport;
5650
import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
@@ -59,8 +53,11 @@
5953
import org.apache.hadoop.yarn.api.records.YarnApplicationState;
6054
import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException;
6155
import org.apache.hadoop.yarn.exceptions.YarnException;
62-
import org.apache.hadoop.util.Time;
56+
import org.apache.tez.common.JavaOptsChecker;
57+
import org.apache.tez.common.Preconditions;
6358
import org.apache.tez.common.ReflectionUtils;
59+
import org.apache.tez.common.TezCommonUtils;
60+
import org.apache.tez.common.counters.Limits;
6461
import org.apache.tez.common.security.JobTokenSecretManager;
6562
import org.apache.tez.dag.api.DAG;
6663
import org.apache.tez.dag.api.DAGSubmissionTimedOut;
@@ -70,20 +67,24 @@
7067
import org.apache.tez.dag.api.SessionNotReady;
7168
import org.apache.tez.dag.api.SessionNotRunning;
7269
import org.apache.tez.dag.api.TezConfiguration;
70+
import org.apache.tez.dag.api.TezConfigurationConstants;
7371
import org.apache.tez.dag.api.TezConstants;
7472
import org.apache.tez.dag.api.TezException;
7573
import org.apache.tez.dag.api.client.DAGClient;
7674
import org.apache.tez.dag.api.client.rpc.DAGClientAMProtocolBlockingPB;
7775
import org.apache.tez.dag.api.client.rpc.DAGClientAMProtocolRPC.GetAMStatusRequestProto;
7876
import org.apache.tez.dag.api.client.rpc.DAGClientAMProtocolRPC.SubmitDAGRequestProto;
7977
import org.apache.tez.dag.api.records.DAGProtos.DAGPlan;
78+
import org.apache.tez.serviceplugins.api.ServicePluginsDescriptor;
8079

8180
import com.google.common.annotations.VisibleForTesting;
82-
import org.apache.tez.common.Preconditions;
8381
import com.google.common.collect.Maps;
8482
import com.google.common.util.concurrent.ThreadFactoryBuilder;
8583
import com.google.protobuf.ServiceException;
8684

85+
import org.slf4j.Logger;
86+
import org.slf4j.LoggerFactory;
87+
8788
/**
8889
* TezClient is used to submit Tez DAGs for execution. DAG's are executed via a
8990
* Tez App Master. TezClient can run the App Master in session or non-session

‎tez-api/src/main/java/org/apache/tez/client/TezClientUtils.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,23 @@
3636
import java.util.Iterator;
3737
import java.util.List;
3838
import java.util.Map;
39+
import java.util.Map.Entry;
40+
import java.util.Objects;
3941
import java.util.Set;
4042
import java.util.TreeMap;
4143
import java.util.Vector;
42-
import java.util.Map.Entry;
43-
import java.util.Objects;
4444

45-
import com.google.common.base.Strings;
4645
import org.apache.commons.codec.digest.DigestUtils;
4746
import org.apache.commons.lang.StringUtils;
48-
import org.apache.hadoop.fs.LocatedFileStatus;
49-
import org.apache.hadoop.fs.RemoteIterator;
50-
import org.apache.tez.common.JavaOptsChecker;
51-
import org.apache.tez.dag.api.records.DAGProtos.AMPluginDescriptorProto;
52-
import org.apache.tez.serviceplugins.api.ServicePluginsDescriptor;
53-
import org.slf4j.Logger;
54-
import org.slf4j.LoggerFactory;
5547
import org.apache.hadoop.classification.InterfaceAudience.Private;
5648
import org.apache.hadoop.conf.Configuration;
5749
import org.apache.hadoop.fs.FSDataOutputStream;
5850
import org.apache.hadoop.fs.FileStatus;
5951
import org.apache.hadoop.fs.FileSystem;
6052
import org.apache.hadoop.fs.LocalFileSystem;
53+
import org.apache.hadoop.fs.LocatedFileStatus;
6154
import org.apache.hadoop.fs.Path;
55+
import org.apache.hadoop.fs.RemoteIterator;
6256
import org.apache.hadoop.fs.permission.FsAction;
6357
import org.apache.hadoop.io.DataOutputBuffer;
6458
import org.apache.hadoop.io.Text;
@@ -90,6 +84,7 @@
9084
import org.apache.hadoop.yarn.util.ConverterUtils;
9185
import org.apache.hadoop.yarn.util.Records;
9286
import org.apache.log4j.Level;
87+
import org.apache.tez.common.JavaOptsChecker;
9388
import org.apache.tez.common.TezCommonUtils;
9489
import org.apache.tez.common.TezYARNUtils;
9590
import org.apache.tez.common.VersionInfo;
@@ -109,15 +104,21 @@
109104
import org.apache.tez.dag.api.Vertex;
110105
import org.apache.tez.dag.api.client.rpc.DAGClientAMProtocolBlockingPB;
111106
import org.apache.tez.dag.api.records.DAGProtos;
107+
import org.apache.tez.dag.api.records.DAGProtos.AMPluginDescriptorProto;
112108
import org.apache.tez.dag.api.records.DAGProtos.ConfigurationProto;
113109
import org.apache.tez.dag.api.records.DAGProtos.DAGPlan;
114110
import org.apache.tez.dag.api.records.DAGProtos.PlanKeyValuePair;
111+
import org.apache.tez.serviceplugins.api.ServicePluginsDescriptor;
115112

116113
import com.google.common.annotations.VisibleForTesting;
117114
import com.google.common.base.Function;
115+
import com.google.common.base.Strings;
118116
import com.google.common.collect.Iterators;
119117
import com.google.common.collect.Lists;
120118

119+
import org.slf4j.Logger;
120+
import org.slf4j.LoggerFactory;
121+
121122
@Private
122123
public final class TezClientUtils {
123124

‎tez-api/src/main/java/org/apache/tez/common/GuavaShim.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
*/
1818
package org.apache.tez.common;
1919

20-
import com.google.common.util.concurrent.MoreExecutors;
21-
2220
import java.lang.reflect.InvocationTargetException;
2321
import java.lang.reflect.Method;
2422
import java.util.concurrent.Executor;
2523

24+
import com.google.common.util.concurrent.MoreExecutors;
25+
2626
/**
2727
* A interoperability layer to work with multiple versions of guava.
2828
*/

0 commit comments

Comments
 (0)