KAFKA-10787: Apply spotless to connect module

build.gradle

@@ -202,15 +202,7 @@ def determineCommitId() {
 }
 
 def excludedSpotlessModules = [':clients',
-                               ':connect:api',
-                               ':connect:basic-auth-extension',
-                               ':connect:file',
-                               ':connect:json',
-                               ':connect:mirror',
-                               ':connect:mirror-client',
                                ':connect:runtime',
-                               ':connect:test-plugins',
-                               ':connect:transforms',
                                ':core',
                                ':examples',
                                ':generator',

connect/api/src/main/java/org/apache/kafka/connect/connector/Connector.java

@@ -19,8 +19,8 @@
 import org.apache.kafka.common.config.Config;
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.common.config.ConfigValue;
-import org.apache.kafka.connect.errors.ConnectException;
 import org.apache.kafka.connect.components.Versioned;
+import org.apache.kafka.connect.errors.ConnectException;
 
 import java.util.List;
 import java.util.Map;

connect/api/src/main/java/org/apache/kafka/connect/data/Struct.java

@@ -284,4 +284,3 @@ public String toString() {
     }
 
 }
-

connect/api/src/main/java/org/apache/kafka/connect/data/Values.java

@@ -19,6 +19,7 @@
 import org.apache.kafka.common.utils.Utils;
 import org.apache.kafka.connect.data.Schema.Type;
 import org.apache.kafka.connect.errors.DataException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

connect/api/src/main/java/org/apache/kafka/connect/health/AbstractState.java

@@ -17,10 +17,10 @@
 
 package org.apache.kafka.connect.health;
 
-import java.util.Objects;
-
 import org.apache.kafka.common.utils.Utils;
 
+import java.util.Objects;
+
 /**
  * Provides the current status for a connector or a task, along with an identifier for its Connect worker
  */

connect/api/src/main/java/org/apache/kafka/connect/health/ConnectorHealth.java

@@ -16,11 +16,11 @@
  */
 package org.apache.kafka.connect.health;
 
+import org.apache.kafka.common.utils.Utils;
+
 import java.util.Map;
 import java.util.Objects;
 
-import org.apache.kafka.common.utils.Utils;
-
 /**
  * Provides basic health information about the connector and its tasks.
  */

connect/api/src/main/java/org/apache/kafka/connect/sink/ErrantRecordReporter.java

@@ -16,9 +16,10 @@
  */
 package org.apache.kafka.connect.sink;
 
-import java.util.concurrent.Future;
 import org.apache.kafka.connect.errors.ConnectException;
 
+import java.util.concurrent.Future;
+
 /**
  * Component that a {@link SinkTask} can use to report problematic records (and their corresponding problems) as it
  * writes them through {@link SinkTask#put(java.util.Collection)}.

connect/api/src/main/java/org/apache/kafka/connect/storage/SimpleHeaderConverter.java

@@ -23,6 +23,7 @@
 import org.apache.kafka.connect.data.SchemaAndValue;
 import org.apache.kafka.connect.data.Values;
 import org.apache.kafka.connect.errors.DataException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

connect/api/src/test/java/org/apache/kafka/connect/connector/ConnectorTest.java

@@ -16,14 +16,14 @@
  */
 package org.apache.kafka.connect.connector;
 
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
 public abstract class ConnectorTest {
 
     protected ConnectorContext context;

connect/api/src/test/java/org/apache/kafka/connect/data/ConnectSchemaTest.java

@@ -17,6 +17,7 @@
 package org.apache.kafka.connect.data;
 
 import org.apache.kafka.connect.errors.DataException;
+
 import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;

connect/api/src/test/java/org/apache/kafka/connect/data/DateTest.java

@@ -17,6 +17,7 @@
 package org.apache.kafka.connect.data;
 
 import org.apache.kafka.connect.errors.DataException;
+
 import org.junit.jupiter.api.Test;
 
 import java.util.Calendar;

connect/api/src/test/java/org/apache/kafka/connect/data/SchemaBuilderTest.java

@@ -17,6 +17,7 @@
 package org.apache.kafka.connect.data;
 
 import org.apache.kafka.connect.errors.SchemaBuilderException;
+
 import org.junit.jupiter.api.Test;
 
 import java.nio.ByteBuffer;

connect/api/src/test/java/org/apache/kafka/connect/data/SchemaProjectorTest.java

@@ -19,6 +19,7 @@
 import org.apache.kafka.connect.data.Schema.Type;
 import org.apache.kafka.connect.errors.DataException;
 import org.apache.kafka.connect.errors.SchemaProjectorException;
+
 import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;

connect/api/src/test/java/org/apache/kafka/connect/data/TimeTest.java

@@ -17,6 +17,7 @@
 package org.apache.kafka.connect.data;
 
 import org.apache.kafka.connect.errors.DataException;
+
 import org.junit.jupiter.api.Test;
 
 import java.util.Calendar;

connect/api/src/test/java/org/apache/kafka/connect/data/TimestampTest.java

@@ -17,6 +17,7 @@
 package org.apache.kafka.connect.data;
 
 import org.apache.kafka.connect.errors.DataException;
+
 import org.junit.jupiter.api.Test;
 
 import java.util.Calendar;

connect/api/src/test/java/org/apache/kafka/connect/data/ValuesTest.java

@@ -20,6 +20,7 @@
 import org.apache.kafka.connect.data.Schema.Type;
 import org.apache.kafka.connect.data.Values.Parser;
 import org.apache.kafka.connect.errors.DataException;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 

connect/api/src/test/java/org/apache/kafka/connect/header/ConnectHeaderTest.java

@@ -20,6 +20,7 @@
 import org.apache.kafka.connect.data.SchemaAndValue;
 import org.apache.kafka.connect.data.SchemaBuilder;
 import org.apache.kafka.connect.data.Struct;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

connect/api/src/test/java/org/apache/kafka/connect/header/ConnectHeadersTest.java

@@ -28,6 +28,7 @@
 import org.apache.kafka.connect.data.Values;
 import org.apache.kafka.connect.errors.DataException;
 import org.apache.kafka.connect.header.Headers.HeaderTransform;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

connect/api/src/test/java/org/apache/kafka/connect/sink/SinkConnectorTest.java

@@ -16,14 +16,14 @@
  */
 package org.apache.kafka.connect.sink;
 
-import java.util.List;
-import java.util.Map;
-
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.connect.connector.ConnectorContext;
 import org.apache.kafka.connect.connector.ConnectorTest;
 import org.apache.kafka.connect.connector.Task;
 
+import java.util.List;
+import java.util.Map;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;

connect/api/src/test/java/org/apache/kafka/connect/sink/SinkRecordTest.java

@@ -22,6 +22,7 @@
 import org.apache.kafka.connect.header.ConnectHeaders;
 import org.apache.kafka.connect.header.Header;
 import org.apache.kafka.connect.header.Headers;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

connect/api/src/test/java/org/apache/kafka/connect/source/SourceConnectorTest.java

@@ -16,15 +16,15 @@
  */
 package org.apache.kafka.connect.source;
 
-import java.util.List;
-import java.util.Map;
-
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.connect.connector.ConnectorContext;
 import org.apache.kafka.connect.connector.ConnectorTest;
 import org.apache.kafka.connect.connector.Task;
 import org.apache.kafka.connect.storage.OffsetStorageReader;
 
+import java.util.List;
+import java.util.Map;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;

connect/api/src/test/java/org/apache/kafka/connect/source/SourceRecordTest.java

@@ -21,6 +21,7 @@
 import org.apache.kafka.connect.header.ConnectHeaders;
 import org.apache.kafka.connect.header.Header;
 import org.apache.kafka.connect.header.Headers;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

connect/api/src/test/java/org/apache/kafka/connect/storage/SimpleHeaderConverterTest.java

@@ -20,6 +20,7 @@
 import org.apache.kafka.connect.data.Schema;
 import org.apache.kafka.connect.data.SchemaAndValue;
 import org.apache.kafka.connect.data.SchemaBuilder;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

connect/api/src/test/java/org/apache/kafka/connect/storage/StringConverterTest.java

@@ -20,6 +20,7 @@
 import org.apache.kafka.common.utils.Utils;
 import org.apache.kafka.connect.data.Schema;
 import org.apache.kafka.connect.data.SchemaAndValue;
+
 import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;

connect/basic-auth-extension/src/main/java/org/apache/kafka/connect/rest/basic/auth/extension/BasicAuthSecurityRestExtension.java

@@ -21,13 +21,15 @@
 import org.apache.kafka.connect.errors.ConnectException;
 import org.apache.kafka.connect.rest.ConnectRestExtension;
 import org.apache.kafka.connect.rest.ConnectRestExtensionContext;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.security.auth.login.Configuration;
 import java.util.Map;
 import java.util.function.Supplier;
 
+import javax.security.auth.login.Configuration;
+
 /**
  * Provides the ability to authenticate incoming BasicAuth credentials using the configured JAAS {@link
  * javax.security.auth.spi.LoginModule}. An entry with the name {@code KafkaConnect} is expected in the JAAS config file configured in the

connect/basic-auth-extension/src/main/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilter.java

@@ -17,32 +17,32 @@
 
 package org.apache.kafka.connect.rest.basic.auth.extension;
 
+import org.apache.kafka.common.config.ConfigException;
+import org.apache.kafka.connect.errors.ConnectException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.charset.StandardCharsets;
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
 import javax.annotation.Priority;
-import javax.security.auth.login.Configuration;
-import javax.ws.rs.HttpMethod;
-import org.apache.kafka.common.config.ConfigException;
-import org.apache.kafka.connect.errors.ConnectException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.login.Configuration;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
+import javax.ws.rs.HttpMethod;
 import javax.ws.rs.Priorities;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;

connect/basic-auth-extension/src/main/java/org/apache/kafka/connect/rest/basic/auth/extension/PropertyFileLoginModule.java

@@ -19,6 +19,7 @@
 
 import org.apache.kafka.common.config.ConfigException;
 import org.apache.kafka.common.utils.Utils;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/BasicAuthSecurityRestExtensionTest.java

@@ -19,19 +19,20 @@
 
 import org.apache.kafka.connect.errors.ConnectException;
 import org.apache.kafka.connect.rest.ConnectRestExtensionContext;
+
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
-import javax.security.auth.login.Configuration;
-import javax.ws.rs.core.Configurable;
-
 import java.io.IOException;
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 
+import javax.security.auth.login.Configuration;
+import javax.ws.rs.core.Configurable;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;

connect/basic-auth-extension/src/test/java/org/apache/kafka/connect/rest/basic/auth/extension/JaasBasicAuthFilterTest.java

@@ -17,16 +17,10 @@
 
 package org.apache.kafka.connect.rest.basic.auth.extension;
 
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.ChoiceCallback;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriInfo;
-
 import org.apache.kafka.common.security.authenticator.TestJaasConfig;
 import org.apache.kafka.connect.errors.ConnectException;
 import org.apache.kafka.test.TestUtils;
+
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
@@ -42,8 +36,14 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.ChoiceCallback;
+import javax.ws.rs.HttpMethod;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;

connect/file/src/main/java/org/apache/kafka/connect/file/FileStreamSinkConnector.java

@@ -24,6 +24,7 @@
 import org.apache.kafka.common.utils.AppInfoParser;
 import org.apache.kafka.connect.connector.Task;
 import org.apache.kafka.connect.sink.SinkConnector;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

connect/file/src/main/java/org/apache/kafka/connect/file/FileStreamSinkTask.java

@@ -22,6 +22,7 @@
 import org.apache.kafka.connect.errors.ConnectException;
 import org.apache.kafka.connect.sink.SinkRecord;
 import org.apache.kafka.connect.sink.SinkTask;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

connect/file/src/main/java/org/apache/kafka/connect/file/FileStreamSourceConnector.java

@@ -25,6 +25,7 @@
 import org.apache.kafka.connect.errors.ConnectException;
 import org.apache.kafka.connect.source.ExactlyOnceSupport;
 import org.apache.kafka.connect.source.SourceConnector;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;