Reformatted Java code and added .editorconfig (#500)

The formatting of the Java code is consistent now, and described in a .editorconfig file. Next to that, all wildecard imports are replaced with specific ones.
obsidiandynamics · Apr 11, 2023 · 3448606 · 3448606
1 parent d563606
commit 3448606
Show file tree

Hide file tree

Showing 57 changed files with 1,686 additions and 761 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/src/main/java/kafdrop/Kafdrop.java b/src/main/java/kafdrop/Kafdrop.java
@@ -18,30 +18,38 @@
 
 package kafdrop;
 
-import com.google.common.base.*;
-import io.undertow.server.*;
+import com.google.common.base.Strings;
+import io.undertow.server.DefaultByteBufferPool;
+import io.undertow.server.HandlerWrapper;
+import io.undertow.server.HttpHandler;
 import io.undertow.server.handlers.DisallowedMethodsHandler;
 import io.undertow.util.HttpString;
-import io.undertow.websockets.jsr.*;
-import kafdrop.config.ini.*;
-import org.slf4j.*;
+import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
+import kafdrop.config.ini.IniFilePropertySource;
+import kafdrop.config.ini.IniFileReader;
 import org.slf4j.Logger;
-import org.springframework.boot.Banner.*;
-import org.springframework.boot.autoconfigure.*;
-import org.springframework.boot.builder.*;
-import org.springframework.boot.context.event.*;
-import org.springframework.boot.web.embedded.undertow.*;
-import org.springframework.boot.web.server.*;
-import org.springframework.context.*;
-import org.springframework.context.annotation.*;
-import org.springframework.core.*;
-import org.springframework.core.env.*;
-import org.springframework.web.servlet.config.annotation.*;
-
-import java.io.*;
-import java.nio.charset.*;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.Banner.Mode;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
+import org.springframework.boot.web.embedded.undertow.UndertowDeploymentInfoCustomizer;
+import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.Ordered;
+import org.springframework.core.env.Environment;
+import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Objects;
-import java.util.stream.*;
+import java.util.stream.Stream;
 
 @SpringBootApplication
 public class Kafdrop {
@@ -56,7 +64,7 @@ public static SpringApplicationBuilder createApplicationBuilder() {
     return new SpringApplicationBuilder(Kafdrop.class)
       .bannerMode(Mode.OFF)
       .listeners(new EnvironmentSetupListener(),
-              new LoggingConfigurationListener());
+        new LoggingConfigurationListener());
   }
 
   @Bean
@@ -116,7 +124,7 @@ public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
         }
       }
       if (environment.containsProperty("debug") &&
-          !"false".equalsIgnoreCase(environment.getProperty("debug", String.class))) {
+        !"false".equalsIgnoreCase(environment.getProperty("debug", String.class))) {
         System.setProperty(PROP_SPRING_BOOT_LOG_LEVEL, "DEBUG");
       }
     }
@@ -154,10 +162,10 @@ public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
 
       if (environment.containsProperty(SM_CONFIG_DIR)) {
         Stream.of("kafdrop", "global")
-            .map(name -> readProperties(environment, name))
-            .filter(Objects::nonNull)
-            .forEach(iniPropSource -> environment.getPropertySources()
-                .addBefore("applicationConfigurationProperties", iniPropSource));
+          .map(name -> readProperties(environment, name))
+          .filter(Objects::nonNull)
+          .forEach(iniPropSource -> environment.getPropertySources()
+            .addBefore("applicationConfigurationProperties", iniPropSource));
       }
     }
 

diff --git a/src/main/java/kafdrop/config/CorsConfiguration.java b/src/main/java/kafdrop/config/CorsConfiguration.java
@@ -18,16 +18,24 @@
 
 package kafdrop.config;
 
-import org.springframework.beans.factory.annotation.*;
-import org.springframework.boot.autoconfigure.condition.*;
-import org.springframework.context.annotation.*;
-import org.springframework.core.*;
-import org.springframework.core.annotation.*;
-import org.springframework.http.*;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
 
-import jakarta.servlet.*;
-import jakarta.servlet.http.*;
-import java.io.*;
+import java.io.IOException;
 
 /**
  * Auto configuration for enabling CORS support. Can override behavior with

diff --git a/src/main/java/kafdrop/config/HealthCheckConfiguration.java b/src/main/java/kafdrop/config/HealthCheckConfiguration.java
@@ -18,13 +18,17 @@
 
 package kafdrop.config;
 
-import org.springframework.boot.actuate.health.*;
-import org.springframework.context.annotation.*;
-import org.springframework.jmx.export.annotation.*;
-import org.springframework.stereotype.*;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthEndpoint;
+import org.springframework.boot.actuate.health.Status;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jmx.export.annotation.ManagedAttribute;
+import org.springframework.jmx.export.annotation.ManagedResource;
+import org.springframework.stereotype.Component;
 
-import java.util.*;
-import java.util.stream.*;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Configuration
 public class HealthCheckConfiguration {
@@ -48,15 +52,15 @@ public Map<String, Object> getHealth() {
 
     private Map<String, Object> getDetails(Map<String, Object> details) {
       return details.entrySet().stream()
-          .collect(Collectors.toMap(Map.Entry::getKey,
-                                    e -> {
-                                      final var health = (Health) e.getValue();
-                                      final var detail = new LinkedHashMap<String, Object>();
-                                      final var healthy = Status.UP.equals(health.getStatus());
-                                      detail.put("healthy", healthy);
-                                      detail.put("message", health.getDetails().toString());
-                                      return detail;
-                                    }));
+        .collect(Collectors.toMap(Map.Entry::getKey,
+          e -> {
+            final var health = (Health) e.getValue();
+            final var detail = new LinkedHashMap<String, Object>();
+            final var healthy = Status.UP.equals(health.getStatus());
+            detail.put("healthy", healthy);
+            detail.put("message", health.getDetails().toString());
+            return detail;
+          }));
     }
 
     private String getStatus(Health health) {

diff --git a/src/main/java/kafdrop/config/InterceptorConfiguration.java b/src/main/java/kafdrop/config/InterceptorConfiguration.java
@@ -18,12 +18,14 @@
 
 package kafdrop.config;
 
-import org.springframework.core.env.*;
-import org.springframework.stereotype.*;
-import org.springframework.web.servlet.*;
-import org.springframework.web.servlet.config.annotation.*;
-
-import jakarta.servlet.http.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.AsyncHandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Component
 public class InterceptorConfiguration implements WebMvcConfigurer {

diff --git a/src/main/java/kafdrop/config/KafkaConfiguration.java b/src/main/java/kafdrop/config/KafkaConfiguration.java
@@ -1,13 +1,18 @@
 package kafdrop.config;
 
-import java.io.*;
-import java.util.*;
-import lombok.*;
-import org.apache.kafka.clients.*;
-import org.apache.kafka.common.config.*;
-import org.slf4j.*;
-import org.springframework.boot.context.properties.*;
-import org.springframework.stereotype.*;
+import lombok.Data;
+import org.apache.kafka.clients.CommonClientConfigs;
+import org.apache.kafka.common.config.SaslConfigs;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Properties;
 
 
 @Component
@@ -31,7 +36,7 @@ public void applyCommon(Properties properties) {
       properties.put(SaslConfigs.SASL_MECHANISM, saslMechanism);
     }
 
-    if(isSecured || securityProtocol.equals("SSL")) {
+    if (isSecured || securityProtocol.equals("SSL")) {
       properties.put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, securityProtocol);
     }
 

diff --git a/src/main/java/kafdrop/config/MessageFormatConfiguration.java b/src/main/java/kafdrop/config/MessageFormatConfiguration.java
@@ -1,11 +1,10 @@
 package kafdrop.config;
 
-import kafdrop.util.*;
-import org.springframework.boot.context.properties.*;
-import org.springframework.context.annotation.*;
-import org.springframework.stereotype.*;
-
-import jakarta.annotation.*;
+import jakarta.annotation.PostConstruct;
+import kafdrop.util.MessageFormat;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 
 
 @Configuration

diff --git a/src/main/java/kafdrop/config/OASConfiguration.java b/src/main/java/kafdrop/config/OASConfiguration.java
@@ -24,16 +24,16 @@
 import org.springframework.context.annotation.Configuration;
 
 /**
- *  Autoconfiguration for OpenAPI Specification (OAS).
- *  Can be disabled by setting {@code springdoc.api-docs.enabled=false}.
+ * Autoconfiguration for OpenAPI Specification (OAS).
+ * Can be disabled by setting {@code springdoc.api-docs.enabled=false}.
  */
 @Configuration
 public class OASConfiguration {
 
   @Bean
   public OpenAPI httpApi() {
     return new OpenAPI().info(new Info()
-            .title("Kafdrop API")
-            .description("JSON APIs for Kafdrop"));
+      .title("Kafdrop API")
+      .description("JSON APIs for Kafdrop"));
   }
 }
diff --git a/src/main/java/kafdrop/config/ProtobufDescriptorConfiguration.java b/src/main/java/kafdrop/config/ProtobufDescriptorConfiguration.java
@@ -1,5 +1,11 @@
 package kafdrop.config;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
 import java.io.File;
 import java.io.FilenameFilter;
 import java.nio.file.Files;
@@ -9,12 +15,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-
 @Configuration
 public class ProtobufDescriptorConfiguration {
   @Component

diff --git a/src/main/java/kafdrop/config/SchemaRegistryConfiguration.java b/src/main/java/kafdrop/config/SchemaRegistryConfiguration.java
@@ -1,12 +1,12 @@
 package kafdrop.config;
 
-import org.springframework.boot.context.properties.*;
-import org.springframework.context.annotation.*;
-import org.springframework.stereotype.*;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 
-import java.util.*;
-import java.util.regex.*;
-import java.util.stream.*;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 
 @Configuration
@@ -27,15 +27,19 @@ public void setConnect(String connect) {
       this.connect = connect;
     }
 
-    public String getAuth() { return auth; }
+    public String getAuth() {
+      return auth;
+    }
 
-    public void setAuth(String auth) { this.auth = auth; }
+    public void setAuth(String auth) {
+      this.auth = auth;
+    }
 
     public List<String> getConnectList() {
       return CONNECT_SEPARATOR.splitAsStream(this.connect)
-          .map(String::trim)
-          .filter(s -> s.length() > 0)
-          .collect(Collectors.toList());
+        .map(String::trim)
+        .filter(s -> s.length() > 0)
+        .collect(Collectors.toList());
     }
   }
 }
diff --git a/src/main/java/kafdrop/config/ini/IniFileProperties.java b/src/main/java/kafdrop/config/ini/IniFileProperties.java
@@ -18,9 +18,11 @@
 
 package kafdrop.config.ini;
 
-import com.google.common.collect.*;
+import com.google.common.collect.Maps;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
 
 public final class IniFileProperties {
   private Map<String, Map<String, String>> sectionProperties = Maps.newLinkedHashMap();

diff --git a/src/main/java/kafdrop/config/ini/IniFilePropertySource.java b/src/main/java/kafdrop/config/ini/IniFilePropertySource.java
@@ -18,10 +18,10 @@
 
 package kafdrop.config.ini;
 
-import com.google.common.collect.*;
-import org.springframework.core.env.*;
+import com.google.common.collect.Maps;
+import org.springframework.core.env.MapPropertySource;
 
-import java.util.*;
+import java.util.Map;
 
 public class IniFilePropertySource extends MapPropertySource {
   public IniFilePropertySource(String name, IniFileProperties source, String[] activeProfiles) {

diff --git a/src/main/java/kafdrop/config/ini/IniFileReader.java b/src/main/java/kafdrop/config/ini/IniFileReader.java
@@ -18,9 +18,11 @@
 
 package kafdrop.config.ini;
 
-import org.apache.commons.lang3.*;
+import org.apache.commons.lang3.StringUtils;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
 
 public class IniFileReader {
   private static final String COMMENT_CHARS = "#;";