95|Re-Organize imports

Co-authored-by: Micha Regel <[email protected]>

edison-aws/src/main/java/de/otto/edison/aws/configuration/AwsConfiguration.java

@@ -13,7 +13,6 @@
 import software.amazon.awssdk.auth.credentials.InstanceProfileCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
 import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.ssm.SsmClient;
 
 import static software.amazon.awssdk.regions.Region.of;
 

edison-core/src/main/java/de/otto/edison/annotations/Beta.java

@@ -4,7 +4,11 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.CLASS;
 
 /**

edison-core/src/main/java/de/otto/edison/authentication/LdapAuthenticationFilter.java

@@ -1,6 +1,10 @@
 package de.otto.edison.authentication;
 
-import com.unboundid.ldap.sdk.*;
+import com.unboundid.ldap.sdk.BindResult;
+import com.unboundid.ldap.sdk.LDAPBindException;
+import com.unboundid.ldap.sdk.LDAPConnection;
+import com.unboundid.ldap.sdk.LDAPException;
+import com.unboundid.ldap.sdk.ResultCode;
 import de.otto.edison.authentication.configuration.LdapProperties;
 import de.otto.edison.authentication.connection.LdapConnectionFactory;
 import org.slf4j.Logger;

edison-core/src/main/java/de/otto/edison/authentication/LdapRoleCheckingRequest.java

@@ -1,6 +1,9 @@
 package de.otto.edison.authentication;
 
-import com.unboundid.ldap.sdk.*;
+import com.unboundid.ldap.sdk.LDAPException;
+import com.unboundid.ldap.sdk.LDAPInterface;
+import com.unboundid.ldap.sdk.SearchRequest;
+import com.unboundid.ldap.sdk.SearchResult;
 import de.otto.edison.authentication.configuration.LdapProperties;
 
 import javax.servlet.http.HttpServletRequest;

edison-core/src/main/java/de/otto/edison/authentication/configuration/LdapConfiguration.java

@@ -1,9 +1,9 @@
 package de.otto.edison.authentication.configuration;
 
 import de.otto.edison.authentication.LdapAuthenticationFilter;
+import de.otto.edison.authentication.connection.LdapConnectionFactory;
 import de.otto.edison.authentication.connection.SSLLdapConnectionFactory;
 import de.otto.edison.authentication.connection.StartTlsLdapConnectionFactory;
-import de.otto.edison.authentication.connection.LdapConnectionFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

edison-core/src/main/java/de/otto/edison/authentication/configuration/LdapProperties.java

@@ -1,11 +1,11 @@
 package de.otto.edison.authentication.configuration;
 
-import javax.validation.constraints.NotEmpty;
 import org.slf4j.Logger;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

edison-core/src/main/java/de/otto/edison/logging/ui/LoggersHtmlEndpoint.java

@@ -8,12 +8,21 @@
 import org.springframework.boot.logging.LogLevel;
 import org.springframework.http.HttpEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.StringJoiner;
+import java.util.StringTokenizer;
 
 import static de.otto.edison.navigation.NavBarItem.navBarItem;
 import static de.otto.edison.util.UrlHelper.baseUriOf;

edison-core/src/main/java/de/otto/edison/registry/client/RegistryClient.java

@@ -1,7 +1,5 @@
 package de.otto.edison.registry.client;
 
-import de.otto.edison.annotations.Beta;
-
 /**
  * A client to access a discovery service.
  *

edison-core/src/main/java/de/otto/edison/registry/configuration/ServiceRegistryConfiguration.java

@@ -1,6 +1,11 @@
 package de.otto.edison.registry.configuration;
 
-import de.otto.edison.status.domain.*;
+import de.otto.edison.status.domain.Availability;
+import de.otto.edison.status.domain.Criticality;
+import de.otto.edison.status.domain.Level;
+import de.otto.edison.status.domain.Performance;
+import de.otto.edison.status.domain.ServiceDependency;
+import de.otto.edison.status.domain.ServiceDependencyBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

edison-core/src/main/java/de/otto/edison/status/configuration/ApplicationStatusAggregatorConfiguration.java

@@ -1,6 +1,10 @@
 package de.otto.edison.status.configuration;
 
-import de.otto.edison.status.domain.*;
+import de.otto.edison.status.domain.ApplicationInfo;
+import de.otto.edison.status.domain.ClusterInfo;
+import de.otto.edison.status.domain.SystemInfo;
+import de.otto.edison.status.domain.TeamInfo;
+import de.otto.edison.status.domain.VersionInfo;
 import de.otto.edison.status.indicator.ApplicationStatusAggregator;
 import de.otto.edison.status.indicator.CachedApplicationStatusAggregator;
 import de.otto.edison.status.indicator.StatusDetailIndicator;

edison-core/src/main/java/de/otto/edison/status/controller/StatusRepresentation.java

@@ -2,7 +2,19 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import de.otto.edison.status.domain.*;
+import de.otto.edison.status.domain.ApplicationStatus;
+import de.otto.edison.status.domain.ClusterInfo;
+import de.otto.edison.status.domain.Criticality;
+import de.otto.edison.status.domain.Datasource;
+import de.otto.edison.status.domain.DatasourceDependency;
+import de.otto.edison.status.domain.Expectations;
+import de.otto.edison.status.domain.ExternalDependency;
+import de.otto.edison.status.domain.Link;
+import de.otto.edison.status.domain.ServiceDependency;
+import de.otto.edison.status.domain.Status;
+import de.otto.edison.status.domain.StatusDetail;
+import de.otto.edison.status.domain.SystemInfo;
+import de.otto.edison.status.domain.TeamInfo;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

edison-core/src/main/java/de/otto/edison/status/domain/StatusDetail.java

@@ -9,7 +9,11 @@
 import static de.otto.edison.status.domain.Status.ERROR;
 import static de.otto.edison.status.domain.Status.OK;
 import static de.otto.edison.status.domain.Status.WARNING;
-import static java.util.Collections.*;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonList;
+import static java.util.Collections.unmodifiableList;
+import static java.util.Collections.unmodifiableMap;
 
 /**
  * The status of a job, component, repository or other part of the application.

edison-core/src/main/java/de/otto/edison/status/indicator/CompositeStatusDetailIndicator.java

@@ -1,6 +1,5 @@
 package de.otto.edison.status.indicator;
 
-import de.otto.edison.status.domain.Status;
 import de.otto.edison.status.domain.StatusDetail;
 
 import java.util.Collection;

edison-core/src/main/java/de/otto/edison/status/indicator/StatusDetailIndicator.java

@@ -4,8 +4,6 @@
 
 import java.util.List;
 
-import static java.util.Arrays.asList;
-
 /**
  * Indicates status information about a single part of the application.
  *

edison-core/src/test/java/de/otto/edison/acceptance/health/HealthEndpointAcceptanceTest.java

@@ -5,7 +5,10 @@
 
 import java.io.IOException;
 
-import static de.otto.edison.acceptance.api.HealthApi.*;
+import static de.otto.edison.acceptance.api.HealthApi.an_healthy_application;
+import static de.otto.edison.acceptance.api.HealthApi.an_unhealthy_application;
+import static de.otto.edison.acceptance.api.HealthApi.the_internal_health_is_retrieved;
+import static de.otto.edison.acceptance.api.HealthApi.the_status_code;
 import static de.otto.edison.testsupport.dsl.Given.given;
 import static de.otto.edison.testsupport.dsl.Then.assertThat;
 import static de.otto.edison.testsupport.dsl.Then.then;

edison-core/src/test/java/de/otto/edison/acceptance/status/StatusAcceptanceConfiguration.java

@@ -1,6 +1,12 @@
 package de.otto.edison.acceptance.status;
 
-import de.otto.edison.status.domain.*;
+import de.otto.edison.status.domain.ApplicationInfo;
+import de.otto.edison.status.domain.Criticality;
+import de.otto.edison.status.domain.Level;
+import de.otto.edison.status.domain.ServiceDependency;
+import de.otto.edison.status.domain.Status;
+import de.otto.edison.status.domain.TeamInfo;
+import de.otto.edison.status.domain.VersionInfo;
 import de.otto.edison.status.indicator.MutableStatusDetailIndicator;
 import de.otto.edison.status.indicator.StatusDetailIndicator;
 import org.springframework.context.annotation.Bean;

edison-core/src/test/java/de/otto/edison/acceptance/status/StatusControllerAcceptanceTest.java

@@ -5,7 +5,12 @@
 
 import java.io.IOException;
 
-import static de.otto.edison.acceptance.api.StatusApi.*;
+import static de.otto.edison.acceptance.api.StatusApi.internal_is_retrieved_as;
+import static de.otto.edison.acceptance.api.StatusApi.internal_status_is_retrieved_as;
+import static de.otto.edison.acceptance.api.StatusApi.the_response_headers;
+import static de.otto.edison.acceptance.api.StatusApi.the_returned_content;
+import static de.otto.edison.acceptance.api.StatusApi.the_returned_json;
+import static de.otto.edison.acceptance.api.StatusApi.the_status_code;
 import static de.otto.edison.testsupport.dsl.Then.assertThat;
 import static de.otto.edison.testsupport.dsl.Then.then;
 import static de.otto.edison.testsupport.dsl.When.when;

edison-core/src/test/java/de/otto/edison/authentication/LdapAuthenticationFilterTest.java

@@ -1,7 +1,10 @@
 package de.otto.edison.authentication;
 
-import com.unboundid.ldap.sdk.*;
-import de.otto.edison.authentication.configuration.EncryptionType;
+import com.unboundid.ldap.sdk.BindResult;
+import com.unboundid.ldap.sdk.LDAPBindException;
+import com.unboundid.ldap.sdk.LDAPConnection;
+import com.unboundid.ldap.sdk.LDAPException;
+import com.unboundid.ldap.sdk.ResultCode;
 import de.otto.edison.authentication.configuration.LdapProperties;
 import de.otto.edison.authentication.connection.LdapConnectionFactory;
 import org.junit.Before;
@@ -15,7 +18,9 @@
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 
-import static com.unboundid.ldap.sdk.ResultCode.*;
+import static com.unboundid.ldap.sdk.ResultCode.AUTHORIZATION_DENIED;
+import static com.unboundid.ldap.sdk.ResultCode.SERVER_DOWN;
+import static com.unboundid.ldap.sdk.ResultCode.SUCCESS;
 import static de.otto.edison.authentication.configuration.EncryptionType.StartTLS;
 import static de.otto.edison.authentication.configuration.LdapProperties.ldapProperties;
 import static java.util.Arrays.asList;

edison-core/src/test/java/de/otto/edison/authentication/connection/StartTlsLdapConnectionFactoryTest.java

@@ -2,7 +2,6 @@
 
 import com.unboundid.ldap.sdk.LDAPException;
 import de.otto.edison.authentication.configuration.LdapProperties;
-import de.otto.edison.authentication.connection.StartTlsLdapConnectionFactory;
 import org.junit.Test;
 
 import java.security.GeneralSecurityException;

edison-core/src/test/java/de/otto/edison/health/indicator/GracefulShutdownHealthIndicatorTest.java

@@ -1,11 +1,10 @@
 package de.otto.edison.health.indicator;
 
 import org.junit.Test;
-import org.mockito.InOrder;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
 import static org.springframework.boot.actuate.health.Health.down;
 import static org.springframework.boot.actuate.health.Health.up;
 

edison-core/src/test/java/de/otto/edison/logging/ui/LoggersAcceptanceTest.java

@@ -2,14 +2,12 @@
 
 import de.otto.edison.navigation.NavBar;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;

edison-core/src/test/java/de/otto/edison/status/controller/StatusRepresentationTest.java

@@ -1,7 +1,11 @@
 package de.otto.edison.status.controller;
 
 import de.otto.edison.configuration.EdisonApplicationProperties;
-import de.otto.edison.status.domain.*;
+import de.otto.edison.status.domain.ApplicationInfo;
+import de.otto.edison.status.domain.ClusterInfo;
+import de.otto.edison.status.domain.SystemInfo;
+import de.otto.edison.status.domain.TeamInfo;
+import de.otto.edison.status.domain.VersionInfo;
 import de.otto.edison.testsupport.util.JsonMap;
 import org.junit.Test;
 

edison-core/src/test/java/de/otto/edison/status/domain/DatasourceDependencyBuilderTest.java

@@ -3,7 +3,13 @@
 import org.junit.Test;
 
 import static de.otto.edison.status.domain.Datasource.datasource;
-import static de.otto.edison.status.domain.DatasourceDependencyBuilder.*;
+import static de.otto.edison.status.domain.DatasourceDependencyBuilder.cassandraDependency;
+import static de.otto.edison.status.domain.DatasourceDependencyBuilder.copyOf;
+import static de.otto.edison.status.domain.DatasourceDependencyBuilder.datasourceDependency;
+import static de.otto.edison.status.domain.DatasourceDependencyBuilder.elasticSearchDependency;
+import static de.otto.edison.status.domain.DatasourceDependencyBuilder.kafkaDependency;
+import static de.otto.edison.status.domain.DatasourceDependencyBuilder.mongoDependency;
+import static de.otto.edison.status.domain.DatasourceDependencyBuilder.redisDependency;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 

edison-core/src/test/java/de/otto/edison/status/domain/StatusDetailTest.java

@@ -4,7 +4,9 @@
 
 import java.util.Map;
 
-import static de.otto.edison.status.domain.Status.*;
+import static de.otto.edison.status.domain.Status.ERROR;
+import static de.otto.edison.status.domain.Status.OK;
+import static de.otto.edison.status.domain.Status.WARNING;
 import static de.otto.edison.status.domain.StatusDetail.statusDetail;
 import static java.util.Collections.singletonMap;
 import static org.hamcrest.CoreMatchers.not;

edison-core/src/test/java/de/otto/edison/status/domain/StatusTest.java

@@ -2,7 +2,10 @@
 
 import org.junit.Test;
 
-import static de.otto.edison.status.domain.Status.*;
+import static de.otto.edison.status.domain.Status.ERROR;
+import static de.otto.edison.status.domain.Status.OK;
+import static de.otto.edison.status.domain.Status.WARNING;
+import static de.otto.edison.status.domain.Status.plus;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 

edison-core/src/test/java/de/otto/edison/status/indicator/EveryTenSecondsSchedulerTest.java

@@ -1,15 +1,20 @@
 package de.otto.edison.status.indicator;
 
-import de.otto.edison.status.domain.*;
+import de.otto.edison.status.domain.ApplicationInfo;
+import de.otto.edison.status.domain.ApplicationStatus;
+import de.otto.edison.status.domain.Status;
+import de.otto.edison.status.domain.SystemInfo;
+import de.otto.edison.status.domain.TeamInfo;
+import de.otto.edison.status.domain.VersionInfo;
 import de.otto.edison.status.scheduler.EveryTenSecondsScheduler;
 import de.otto.edison.status.scheduler.Scheduler;
 import org.junit.Test;
 
 import static de.otto.edison.status.domain.ApplicationStatus.applicationStatus;
 import static de.otto.edison.status.domain.StatusDetail.statusDetail;
 import static java.util.Collections.singletonList;
-import static org.hamcrest.Matchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

edison-core/src/test/java/de/otto/edison/status/indicator/MutableStatusDetailIndicatorTest.java

@@ -3,13 +3,15 @@
 import de.otto.edison.status.domain.StatusDetail;
 import org.junit.Test;
 
-import static de.otto.edison.status.domain.Status.*;
+import static de.otto.edison.status.domain.Status.ERROR;
+import static de.otto.edison.status.domain.Status.OK;
+import static de.otto.edison.status.domain.Status.WARNING;
 import static de.otto.edison.status.domain.StatusDetail.statusDetail;
 import static java.util.Collections.singletonMap;
-import static org.hamcrest.Matchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
 
 public class MutableStatusDetailIndicatorTest {
 

edison-jobs/src/main/java/de/otto/edison/jobs/configuration/JobsConfiguration.java

@@ -27,7 +27,6 @@
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +35,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static de.otto.edison.status.domain.StatusDetail.statusDetail;
-import static java.util.Collections.*;
+import static java.util.Collections.singletonList;
 import static java.util.concurrent.Executors.newScheduledThreadPool;
 import static java.util.stream.Collectors.toList;
 

edison-jobs/src/main/java/de/otto/edison/jobs/controller/JobDefinitionsController.java

@@ -20,7 +20,11 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.Duration;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 import static de.otto.edison.jobs.controller.JobDefinitionRepresentation.representationOf;
 import static de.otto.edison.navigation.NavBarItem.navBarItem;