diff --git a/edison-aws/src/main/java/de/otto/edison/aws/configuration/AwsConfiguration.java b/edison-aws/src/main/java/de/otto/edison/aws/configuration/AwsConfiguration.java index 6ab2fb213..2a78c38ad 100644 --- a/edison-aws/src/main/java/de/otto/edison/aws/configuration/AwsConfiguration.java +++ b/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; diff --git a/edison-core/src/main/java/de/otto/edison/annotations/Beta.java b/edison-core/src/main/java/de/otto/edison/annotations/Beta.java index 73f80e5d8..71dcd6e60 100644 --- a/edison-core/src/main/java/de/otto/edison/annotations/Beta.java +++ b/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; /** diff --git a/edison-core/src/main/java/de/otto/edison/authentication/LdapAuthenticationFilter.java b/edison-core/src/main/java/de/otto/edison/authentication/LdapAuthenticationFilter.java index 3e73bb102..cc46496ae 100644 --- a/edison-core/src/main/java/de/otto/edison/authentication/LdapAuthenticationFilter.java +++ b/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; diff --git a/edison-core/src/main/java/de/otto/edison/authentication/LdapRoleCheckingRequest.java b/edison-core/src/main/java/de/otto/edison/authentication/LdapRoleCheckingRequest.java index 55d30d8fc..548586cc7 100644 --- a/edison-core/src/main/java/de/otto/edison/authentication/LdapRoleCheckingRequest.java +++ b/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; diff --git a/edison-core/src/main/java/de/otto/edison/authentication/configuration/LdapConfiguration.java b/edison-core/src/main/java/de/otto/edison/authentication/configuration/LdapConfiguration.java index 4589078a6..49941fd93 100644 --- a/edison-core/src/main/java/de/otto/edison/authentication/configuration/LdapConfiguration.java +++ b/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; diff --git a/edison-core/src/main/java/de/otto/edison/authentication/configuration/LdapProperties.java b/edison-core/src/main/java/de/otto/edison/authentication/configuration/LdapProperties.java index 1b82854b3..cd5507c48 100644 --- a/edison-core/src/main/java/de/otto/edison/authentication/configuration/LdapProperties.java +++ b/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; diff --git a/edison-core/src/main/java/de/otto/edison/logging/ui/LoggersHtmlEndpoint.java b/edison-core/src/main/java/de/otto/edison/logging/ui/LoggersHtmlEndpoint.java index 7892f8ff6..4108e4498 100644 --- a/edison-core/src/main/java/de/otto/edison/logging/ui/LoggersHtmlEndpoint.java +++ b/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; diff --git a/edison-core/src/main/java/de/otto/edison/registry/client/RegistryClient.java b/edison-core/src/main/java/de/otto/edison/registry/client/RegistryClient.java index 67f89094d..e4a520f2b 100644 --- a/edison-core/src/main/java/de/otto/edison/registry/client/RegistryClient.java +++ b/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. * diff --git a/edison-core/src/main/java/de/otto/edison/registry/configuration/ServiceRegistryConfiguration.java b/edison-core/src/main/java/de/otto/edison/registry/configuration/ServiceRegistryConfiguration.java index f777d9114..5e69838d7 100644 --- a/edison-core/src/main/java/de/otto/edison/registry/configuration/ServiceRegistryConfiguration.java +++ b/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; diff --git a/edison-core/src/main/java/de/otto/edison/status/configuration/ApplicationStatusAggregatorConfiguration.java b/edison-core/src/main/java/de/otto/edison/status/configuration/ApplicationStatusAggregatorConfiguration.java index 62cdec528..51e2d581b 100644 --- a/edison-core/src/main/java/de/otto/edison/status/configuration/ApplicationStatusAggregatorConfiguration.java +++ b/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; diff --git a/edison-core/src/main/java/de/otto/edison/status/controller/StatusRepresentation.java b/edison-core/src/main/java/de/otto/edison/status/controller/StatusRepresentation.java index 3a841fc68..00bb84d1d 100644 --- a/edison-core/src/main/java/de/otto/edison/status/controller/StatusRepresentation.java +++ b/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; diff --git a/edison-core/src/main/java/de/otto/edison/status/domain/StatusDetail.java b/edison-core/src/main/java/de/otto/edison/status/domain/StatusDetail.java index 4a8a39201..1bb0a321d 100644 --- a/edison-core/src/main/java/de/otto/edison/status/domain/StatusDetail.java +++ b/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. diff --git a/edison-core/src/main/java/de/otto/edison/status/indicator/CompositeStatusDetailIndicator.java b/edison-core/src/main/java/de/otto/edison/status/indicator/CompositeStatusDetailIndicator.java index 5ee28583b..f9ccb27c5 100644 --- a/edison-core/src/main/java/de/otto/edison/status/indicator/CompositeStatusDetailIndicator.java +++ b/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; diff --git a/edison-core/src/main/java/de/otto/edison/status/indicator/StatusDetailIndicator.java b/edison-core/src/main/java/de/otto/edison/status/indicator/StatusDetailIndicator.java index fb3a7e80d..03c49d19a 100644 --- a/edison-core/src/main/java/de/otto/edison/status/indicator/StatusDetailIndicator.java +++ b/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. * diff --git a/edison-core/src/test/java/de/otto/edison/acceptance/health/HealthEndpointAcceptanceTest.java b/edison-core/src/test/java/de/otto/edison/acceptance/health/HealthEndpointAcceptanceTest.java index a2d8b5deb..975b34e73 100644 --- a/edison-core/src/test/java/de/otto/edison/acceptance/health/HealthEndpointAcceptanceTest.java +++ b/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; diff --git a/edison-core/src/test/java/de/otto/edison/acceptance/status/StatusAcceptanceConfiguration.java b/edison-core/src/test/java/de/otto/edison/acceptance/status/StatusAcceptanceConfiguration.java index 9e4507695..bca9a0a71 100644 --- a/edison-core/src/test/java/de/otto/edison/acceptance/status/StatusAcceptanceConfiguration.java +++ b/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; diff --git a/edison-core/src/test/java/de/otto/edison/acceptance/status/StatusControllerAcceptanceTest.java b/edison-core/src/test/java/de/otto/edison/acceptance/status/StatusControllerAcceptanceTest.java index 63ffc068d..43ab3573a 100644 --- a/edison-core/src/test/java/de/otto/edison/acceptance/status/StatusControllerAcceptanceTest.java +++ b/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; diff --git a/edison-core/src/test/java/de/otto/edison/authentication/LdapAuthenticationFilterTest.java b/edison-core/src/test/java/de/otto/edison/authentication/LdapAuthenticationFilterTest.java index 37e50e03a..87ed4448f 100644 --- a/edison-core/src/test/java/de/otto/edison/authentication/LdapAuthenticationFilterTest.java +++ b/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; diff --git a/edison-core/src/test/java/de/otto/edison/authentication/connection/StartTlsLdapConnectionFactoryTest.java b/edison-core/src/test/java/de/otto/edison/authentication/connection/StartTlsLdapConnectionFactoryTest.java index 2b52a3360..44cccc7dc 100644 --- a/edison-core/src/test/java/de/otto/edison/authentication/connection/StartTlsLdapConnectionFactoryTest.java +++ b/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; diff --git a/edison-core/src/test/java/de/otto/edison/health/indicator/GracefulShutdownHealthIndicatorTest.java b/edison-core/src/test/java/de/otto/edison/health/indicator/GracefulShutdownHealthIndicatorTest.java index ff8d26793..523be0080 100644 --- a/edison-core/src/test/java/de/otto/edison/health/indicator/GracefulShutdownHealthIndicatorTest.java +++ b/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; diff --git a/edison-core/src/test/java/de/otto/edison/logging/ui/LoggersAcceptanceTest.java b/edison-core/src/test/java/de/otto/edison/logging/ui/LoggersAcceptanceTest.java index 70e213aa2..ad4a7254c 100644 --- a/edison-core/src/test/java/de/otto/edison/logging/ui/LoggersAcceptanceTest.java +++ b/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; diff --git a/edison-core/src/test/java/de/otto/edison/status/controller/StatusRepresentationTest.java b/edison-core/src/test/java/de/otto/edison/status/controller/StatusRepresentationTest.java index 93f9219dd..f13849f5c 100644 --- a/edison-core/src/test/java/de/otto/edison/status/controller/StatusRepresentationTest.java +++ b/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; diff --git a/edison-core/src/test/java/de/otto/edison/status/domain/DatasourceDependencyBuilderTest.java b/edison-core/src/test/java/de/otto/edison/status/domain/DatasourceDependencyBuilderTest.java index 9c046aa62..8dd1f3e4e 100644 --- a/edison-core/src/test/java/de/otto/edison/status/domain/DatasourceDependencyBuilderTest.java +++ b/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; diff --git a/edison-core/src/test/java/de/otto/edison/status/domain/StatusDetailTest.java b/edison-core/src/test/java/de/otto/edison/status/domain/StatusDetailTest.java index bc21c87fe..2718afb59 100644 --- a/edison-core/src/test/java/de/otto/edison/status/domain/StatusDetailTest.java +++ b/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; diff --git a/edison-core/src/test/java/de/otto/edison/status/domain/StatusTest.java b/edison-core/src/test/java/de/otto/edison/status/domain/StatusTest.java index 74ab934e1..63044ba74 100644 --- a/edison-core/src/test/java/de/otto/edison/status/domain/StatusTest.java +++ b/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; diff --git a/edison-core/src/test/java/de/otto/edison/status/indicator/EveryTenSecondsSchedulerTest.java b/edison-core/src/test/java/de/otto/edison/status/indicator/EveryTenSecondsSchedulerTest.java index 1552d96bd..86b186f1f 100644 --- a/edison-core/src/test/java/de/otto/edison/status/indicator/EveryTenSecondsSchedulerTest.java +++ b/edison-core/src/test/java/de/otto/edison/status/indicator/EveryTenSecondsSchedulerTest.java @@ -1,6 +1,11 @@ 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; @@ -8,8 +13,8 @@ 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; diff --git a/edison-core/src/test/java/de/otto/edison/status/indicator/MutableStatusDetailIndicatorTest.java b/edison-core/src/test/java/de/otto/edison/status/indicator/MutableStatusDetailIndicatorTest.java index 327168446..03631ae8b 100644 --- a/edison-core/src/test/java/de/otto/edison/status/indicator/MutableStatusDetailIndicatorTest.java +++ b/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 { diff --git a/edison-jobs/src/main/java/de/otto/edison/jobs/configuration/JobsConfiguration.java b/edison-jobs/src/main/java/de/otto/edison/jobs/configuration/JobsConfiguration.java index d743c578a..0d00b4a29 100644 --- a/edison-jobs/src/main/java/de/otto/edison/jobs/configuration/JobsConfiguration.java +++ b/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; diff --git a/edison-jobs/src/main/java/de/otto/edison/jobs/controller/JobDefinitionsController.java b/edison-jobs/src/main/java/de/otto/edison/jobs/controller/JobDefinitionsController.java index 3a756928b..eb2dcf767 100644 --- a/edison-jobs/src/main/java/de/otto/edison/jobs/controller/JobDefinitionsController.java +++ b/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; diff --git a/edison-jobs/src/main/java/de/otto/edison/jobs/domain/JobInfo.java b/edison-jobs/src/main/java/de/otto/edison/jobs/domain/JobInfo.java index d45582f4d..296509005 100644 --- a/edison-jobs/src/main/java/de/otto/edison/jobs/domain/JobInfo.java +++ b/edison-jobs/src/main/java/de/otto/edison/jobs/domain/JobInfo.java @@ -14,7 +14,6 @@ import static java.util.Collections.emptyList; import static java.util.Collections.unmodifiableList; import static java.util.Optional.empty; -import static java.util.Optional.of; import static java.util.Optional.ofNullable; /** diff --git a/edison-jobs/src/main/java/de/otto/edison/jobs/domain/JobMeta.java b/edison-jobs/src/main/java/de/otto/edison/jobs/domain/JobMeta.java index 60ea8fd55..71bcbd9df 100644 --- a/edison-jobs/src/main/java/de/otto/edison/jobs/domain/JobMeta.java +++ b/edison-jobs/src/main/java/de/otto/edison/jobs/domain/JobMeta.java @@ -1,10 +1,7 @@ package de.otto.edison.jobs.domain; -import java.time.Instant; -import java.util.Collections; import java.util.Map; -import static java.time.Instant.ofEpochMilli; import static java.util.Collections.unmodifiableMap; /** diff --git a/edison-jobs/src/main/java/de/otto/edison/jobs/domain/MetaJobRunnable.java b/edison-jobs/src/main/java/de/otto/edison/jobs/domain/MetaJobRunnable.java index ac8dd7069..b7e1007ee 100644 --- a/edison-jobs/src/main/java/de/otto/edison/jobs/domain/MetaJobRunnable.java +++ b/edison-jobs/src/main/java/de/otto/edison/jobs/domain/MetaJobRunnable.java @@ -1,7 +1,6 @@ package de.otto.edison.jobs.domain; import de.otto.edison.jobs.repository.JobMetaRepository; -import de.otto.edison.jobs.service.JobMetaService; import de.otto.edison.jobs.service.JobRunnable; import java.time.Instant; diff --git a/edison-jobs/src/main/java/de/otto/edison/jobs/repository/cleanup/DeleteSkippedJobs.java b/edison-jobs/src/main/java/de/otto/edison/jobs/repository/cleanup/DeleteSkippedJobs.java index 2aa2a2dc4..a608b791e 100644 --- a/edison-jobs/src/main/java/de/otto/edison/jobs/repository/cleanup/DeleteSkippedJobs.java +++ b/edison-jobs/src/main/java/de/otto/edison/jobs/repository/cleanup/DeleteSkippedJobs.java @@ -1,25 +1,19 @@ package de.otto.edison.jobs.repository.cleanup; -import static de.otto.edison.jobs.domain.JobInfo.JobStatus.OK; -import static de.otto.edison.jobs.domain.JobInfo.JobStatus.SKIPPED; -import static java.util.Comparator.comparing; -import static java.util.Comparator.reverseOrder; -import static java.util.stream.Collectors.groupingBy; +import de.otto.edison.jobs.domain.JobInfo; +import de.otto.edison.jobs.repository.JobRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.Scheduled; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.Optional; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; - -import de.otto.edison.jobs.domain.JobInfo; -import de.otto.edison.jobs.domain.JobInfo.JobStatus; -import de.otto.edison.jobs.repository.JobRepository; -import de.otto.edison.jobs.repository.cleanup.JobCleanupStrategy; +import static de.otto.edison.jobs.domain.JobInfo.JobStatus.SKIPPED; +import static java.util.Comparator.comparing; +import static java.util.Comparator.reverseOrder; +import static java.util.stream.Collectors.groupingBy; /** * A JobCleanupStrategy that is removing all but the newest N skipped jobs. diff --git a/edison-jobs/src/main/java/de/otto/edison/jobs/repository/cleanup/KeepLastJobs.java b/edison-jobs/src/main/java/de/otto/edison/jobs/repository/cleanup/KeepLastJobs.java index 4a5596c87..0da95e25e 100644 --- a/edison-jobs/src/main/java/de/otto/edison/jobs/repository/cleanup/KeepLastJobs.java +++ b/edison-jobs/src/main/java/de/otto/edison/jobs/repository/cleanup/KeepLastJobs.java @@ -4,7 +4,6 @@ import de.otto.edison.jobs.repository.JobRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import java.util.ArrayList; diff --git a/edison-jobs/src/main/java/de/otto/edison/jobs/repository/inmem/InMemJobRepository.java b/edison-jobs/src/main/java/de/otto/edison/jobs/repository/inmem/InMemJobRepository.java index 0d876ab28..2b6ec2c84 100644 --- a/edison-jobs/src/main/java/de/otto/edison/jobs/repository/inmem/InMemJobRepository.java +++ b/edison-jobs/src/main/java/de/otto/edison/jobs/repository/inmem/InMemJobRepository.java @@ -6,7 +6,12 @@ import de.otto.edison.jobs.repository.JobRepository; import java.time.OffsetDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/edison-jobs/src/main/java/de/otto/edison/jobs/service/JobRunner.java b/edison-jobs/src/main/java/de/otto/edison/jobs/service/JobRunner.java index bc1966017..871585aa7 100644 --- a/edison-jobs/src/main/java/de/otto/edison/jobs/service/JobRunner.java +++ b/edison-jobs/src/main/java/de/otto/edison/jobs/service/JobRunner.java @@ -12,7 +12,11 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; -import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.*; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.KEEP_ALIVE; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.RESTART; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.SKIPPED; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.START; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.STOP; import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.newStateChangeEvent; import static java.lang.String.format; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/edison-jobs/src/main/java/de/otto/edison/jobs/service/JobService.java b/edison-jobs/src/main/java/de/otto/edison/jobs/service/JobService.java index da993a86f..d84f69cee 100644 --- a/edison-jobs/src/main/java/de/otto/edison/jobs/service/JobService.java +++ b/edison-jobs/src/main/java/de/otto/edison/jobs/service/JobService.java @@ -24,8 +24,13 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.stream.Collectors; -import static de.otto.edison.jobs.domain.JobInfo.*; -import static de.otto.edison.jobs.domain.JobInfo.JobStatus.*; +import static de.otto.edison.jobs.domain.JobInfo.Builder; +import static de.otto.edison.jobs.domain.JobInfo.JobStatus; +import static de.otto.edison.jobs.domain.JobInfo.JobStatus.DEAD; +import static de.otto.edison.jobs.domain.JobInfo.JobStatus.ERROR; +import static de.otto.edison.jobs.domain.JobInfo.JobStatus.OK; +import static de.otto.edison.jobs.domain.JobInfo.JobStatus.SKIPPED; +import static de.otto.edison.jobs.domain.JobInfo.newJobInfo; import static de.otto.edison.jobs.domain.JobMessage.jobMessage; import static de.otto.edison.jobs.domain.Level.INFO; import static de.otto.edison.jobs.domain.Level.WARNING; diff --git a/edison-jobs/src/main/java/de/otto/edison/jobs/status/JobStatusDetailIndicator.java b/edison-jobs/src/main/java/de/otto/edison/jobs/status/JobStatusDetailIndicator.java index 1a153de36..65f438fa7 100644 --- a/edison-jobs/src/main/java/de/otto/edison/jobs/status/JobStatusDetailIndicator.java +++ b/edison-jobs/src/main/java/de/otto/edison/jobs/status/JobStatusDetailIndicator.java @@ -4,7 +4,6 @@ import de.otto.edison.status.domain.StatusDetail; import de.otto.edison.status.indicator.StatusDetailIndicator; -import java.util.Collections; import java.util.List; import static java.util.Collections.singletonList; diff --git a/edison-jobs/src/test/java/de/otto/edison/jobs/configuration/JobsConfigurationTest.java b/edison-jobs/src/test/java/de/otto/edison/jobs/configuration/JobsConfigurationTest.java index ee43160d1..85f94b5fc 100644 --- a/edison-jobs/src/test/java/de/otto/edison/jobs/configuration/JobsConfigurationTest.java +++ b/edison-jobs/src/test/java/de/otto/edison/jobs/configuration/JobsConfigurationTest.java @@ -24,7 +24,9 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class JobsConfigurationTest { diff --git a/edison-jobs/src/test/java/de/otto/edison/jobs/controller/JobsControllerTest.java b/edison-jobs/src/test/java/de/otto/edison/jobs/controller/JobsControllerTest.java index 7ea44f722..15a5e5149 100644 --- a/edison-jobs/src/test/java/de/otto/edison/jobs/controller/JobsControllerTest.java +++ b/edison-jobs/src/test/java/de/otto/edison/jobs/controller/JobsControllerTest.java @@ -33,7 +33,12 @@ import static javax.servlet.http.HttpServletResponse.SC_MOVED_TEMPORARILY; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/edison-jobs/src/test/java/de/otto/edison/jobs/eventbus/PersistenceJobStateChangeListenerTest.java b/edison-jobs/src/test/java/de/otto/edison/jobs/eventbus/PersistenceJobStateChangeListenerTest.java index 6758312b2..d35f48c1e 100644 --- a/edison-jobs/src/test/java/de/otto/edison/jobs/eventbus/PersistenceJobStateChangeListenerTest.java +++ b/edison-jobs/src/test/java/de/otto/edison/jobs/eventbus/PersistenceJobStateChangeListenerTest.java @@ -12,7 +12,12 @@ import static de.otto.edison.jobs.domain.JobMessage.jobMessage; import static de.otto.edison.jobs.domain.Level.ERROR; -import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.*; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.DEAD; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.FAILED; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.KEEP_ALIVE; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.RESTART; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.SKIPPED; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.STOP; import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.newStateChangeEvent; import static java.time.Instant.ofEpochMilli; import static java.time.OffsetDateTime.ofInstant; diff --git a/edison-jobs/src/test/java/de/otto/edison/jobs/repository/DeleteSkippedJobsTest.java b/edison-jobs/src/test/java/de/otto/edison/jobs/repository/DeleteSkippedJobsTest.java index e834d8d16..3e75802d3 100644 --- a/edison-jobs/src/test/java/de/otto/edison/jobs/repository/DeleteSkippedJobsTest.java +++ b/edison-jobs/src/test/java/de/otto/edison/jobs/repository/DeleteSkippedJobsTest.java @@ -9,8 +9,6 @@ import java.time.Clock; import java.time.Instant; -import static de.otto.edison.jobs.domain.JobInfo.JobStatus.ERROR; -import static de.otto.edison.jobs.domain.JobInfo.JobStatus.OK; import static de.otto.edison.jobs.domain.JobInfo.JobStatus.SKIPPED; import static de.otto.edison.jobs.domain.JobInfo.builder; import static de.otto.edison.testsupport.matcher.OptionalMatchers.isAbsent; @@ -19,7 +17,6 @@ import static java.time.OffsetDateTime.now; import static java.time.ZoneId.systemDefault; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; public class DeleteSkippedJobsTest { diff --git a/edison-jobs/src/test/java/de/otto/edison/jobs/service/JobMutexGroupsTest.java b/edison-jobs/src/test/java/de/otto/edison/jobs/service/JobMutexGroupsTest.java index b876d1125..e8695d70e 100644 --- a/edison-jobs/src/test/java/de/otto/edison/jobs/service/JobMutexGroupsTest.java +++ b/edison-jobs/src/test/java/de/otto/edison/jobs/service/JobMutexGroupsTest.java @@ -8,9 +8,9 @@ import static de.otto.edison.testsupport.util.Sets.hashSet; import static java.util.Collections.singleton; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.contains; public class JobMutexGroupsTest { diff --git a/edison-jobs/src/test/java/de/otto/edison/jobs/service/JobRunnerTest.java b/edison-jobs/src/test/java/de/otto/edison/jobs/service/JobRunnerTest.java index 7624b690d..39cd81846 100644 --- a/edison-jobs/src/test/java/de/otto/edison/jobs/service/JobRunnerTest.java +++ b/edison-jobs/src/test/java/de/otto/edison/jobs/service/JobRunnerTest.java @@ -15,7 +15,11 @@ import static de.otto.edison.jobs.definition.DefaultJobDefinition.fixedDelayJobDefinition; import static de.otto.edison.jobs.definition.DefaultJobDefinition.manuallyTriggerableJobDefinition; -import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.*; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.KEEP_ALIVE; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.RESTART; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.SKIPPED; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.START; +import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.State.STOP; import static de.otto.edison.jobs.eventbus.events.StateChangeEvent.newStateChangeEvent; import static de.otto.edison.jobs.service.JobRunner.newJobRunner; import static java.time.Duration.ofSeconds; @@ -27,7 +31,12 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; public class JobRunnerTest { diff --git a/edison-jobs/src/test/java/de/otto/edison/jobs/service/JobServiceTest.java b/edison-jobs/src/test/java/de/otto/edison/jobs/service/JobServiceTest.java index ee6c5c76c..91e2d4f40 100644 --- a/edison-jobs/src/test/java/de/otto/edison/jobs/service/JobServiceTest.java +++ b/edison-jobs/src/test/java/de/otto/edison/jobs/service/JobServiceTest.java @@ -40,7 +40,13 @@ import static org.hamcrest.Matchers.not; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; public class JobServiceTest { diff --git a/edison-jobs/src/test/java/de/otto/edison/jobs/status/JobStatusCalculatorTest.java b/edison-jobs/src/test/java/de/otto/edison/jobs/status/JobStatusCalculatorTest.java index f996a9539..2b5c1773b 100644 --- a/edison-jobs/src/test/java/de/otto/edison/jobs/status/JobStatusCalculatorTest.java +++ b/edison-jobs/src/test/java/de/otto/edison/jobs/status/JobStatusCalculatorTest.java @@ -26,9 +26,9 @@ import static java.util.Collections.singletonList; import static java.util.Optional.empty; import static java.util.Optional.of; -import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasKey; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; diff --git a/edison-mongo/src/main/java/de/otto/edison/mongo/MongoStatusDetailIndicator.java b/edison-mongo/src/main/java/de/otto/edison/mongo/MongoStatusDetailIndicator.java index 8dcc925bd..7707c3488 100644 --- a/edison-mongo/src/main/java/de/otto/edison/mongo/MongoStatusDetailIndicator.java +++ b/edison-mongo/src/main/java/de/otto/edison/mongo/MongoStatusDetailIndicator.java @@ -9,13 +9,12 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; -import java.util.Collections; import java.util.List; 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.StatusDetail.*; -import static java.util.Collections.*; +import static de.otto.edison.status.domain.StatusDetail.statusDetail; +import static java.util.Collections.singletonList; @Component @ConditionalOnProperty(prefix = "edison.mongo.status", name = "enabled", havingValue = "true", matchIfMissing = true) diff --git a/edison-mongo/src/main/java/de/otto/edison/mongo/configuration/MongoProperties.java b/edison-mongo/src/main/java/de/otto/edison/mongo/configuration/MongoProperties.java index 8eb83f1c9..0b697d4b7 100644 --- a/edison-mongo/src/main/java/de/otto/edison/mongo/configuration/MongoProperties.java +++ b/edison-mongo/src/main/java/de/otto/edison/mongo/configuration/MongoProperties.java @@ -5,13 +5,13 @@ import com.mongodb.ServerAddress; import de.otto.edison.status.domain.Datasource; import org.bson.codecs.configuration.CodecRegistry; -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.Valid; import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; import java.util.List; import java.util.Objects; import java.util.stream.Stream; diff --git a/edison-mongo/src/main/java/de/otto/edison/mongo/jobs/MongoJobMetaRepository.java b/edison-mongo/src/main/java/de/otto/edison/mongo/jobs/MongoJobMetaRepository.java index 5c8ab63d3..76d4a384f 100644 --- a/edison-mongo/src/main/java/de/otto/edison/mongo/jobs/MongoJobMetaRepository.java +++ b/edison-mongo/src/main/java/de/otto/edison/mongo/jobs/MongoJobMetaRepository.java @@ -1,31 +1,28 @@ package de.otto.edison.mongo.jobs; -import static java.util.Collections.emptyMap; -import static java.util.stream.Collectors.toMap; -import static java.util.stream.Collectors.toSet; -import static java.util.stream.StreamSupport.stream; - -import static com.mongodb.client.model.Filters.and; -import static com.mongodb.client.model.Filters.eq; -import static com.mongodb.client.model.Filters.exists; -import static com.mongodb.client.model.Updates.set; -import static com.mongodb.client.model.Updates.unset; - -import java.util.Map; -import java.util.Set; -import java.util.concurrent.TimeUnit; - -import de.otto.edison.mongo.configuration.MongoProperties; -import org.bson.Document; -import org.bson.conversions.Bson; - import com.mongodb.BasicDBObject; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import com.mongodb.client.model.FindOneAndUpdateOptions; - import de.otto.edison.jobs.domain.JobMeta; import de.otto.edison.jobs.repository.JobMetaRepository; +import de.otto.edison.mongo.configuration.MongoProperties; +import org.bson.Document; +import org.bson.conversions.Bson; + +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +import static com.mongodb.client.model.Filters.and; +import static com.mongodb.client.model.Filters.eq; +import static com.mongodb.client.model.Filters.exists; +import static com.mongodb.client.model.Updates.set; +import static com.mongodb.client.model.Updates.unset; +import static java.util.Collections.emptyMap; +import static java.util.stream.Collectors.toMap; +import static java.util.stream.Collectors.toSet; +import static java.util.stream.StreamSupport.stream; /** * {@inheritDoc} diff --git a/edison-mongo/src/main/java/de/otto/edison/mongo/jobs/MongoJobRepository.java b/edison-mongo/src/main/java/de/otto/edison/mongo/jobs/MongoJobRepository.java index d31b19c9c..50bd05d1c 100644 --- a/edison-mongo/src/main/java/de/otto/edison/mongo/jobs/MongoJobRepository.java +++ b/edison-mongo/src/main/java/de/otto/edison/mongo/jobs/MongoJobRepository.java @@ -16,12 +16,19 @@ import java.time.Clock; import java.time.OffsetDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.concurrent.TimeUnit; import static com.mongodb.ReadPreference.primaryPreferred; import static com.mongodb.client.model.Filters.eq; -import static com.mongodb.client.model.Updates.*; +import static com.mongodb.client.model.Updates.combine; +import static com.mongodb.client.model.Updates.push; +import static com.mongodb.client.model.Updates.set; import static de.otto.edison.jobs.domain.JobInfo.newJobInfo; import static de.otto.edison.jobs.domain.JobMessage.jobMessage; import static java.time.Clock.systemDefaultZone; diff --git a/edison-mongo/src/test/java/de/otto/edison/mongo/MongoStatusDetailIndicatorTest.java b/edison-mongo/src/test/java/de/otto/edison/mongo/MongoStatusDetailIndicatorTest.java index 4035615c3..d818aec8c 100644 --- a/edison-mongo/src/test/java/de/otto/edison/mongo/MongoStatusDetailIndicatorTest.java +++ b/edison-mongo/src/test/java/de/otto/edison/mongo/MongoStatusDetailIndicatorTest.java @@ -10,11 +10,10 @@ import org.mockito.Mock; import static de.otto.edison.status.domain.Status.ERROR; +import static de.otto.edison.status.domain.Status.OK; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; - -import static de.otto.edison.status.domain.Status.OK; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/edison-mongo/src/test/java/de/otto/edison/mongo/jobs/MongoJobRepositoryTest.java b/edison-mongo/src/test/java/de/otto/edison/mongo/jobs/MongoJobRepositoryTest.java index 3555e98e0..098a78b9e 100644 --- a/edison-mongo/src/test/java/de/otto/edison/mongo/jobs/MongoJobRepositoryTest.java +++ b/edison-mongo/src/test/java/de/otto/edison/mongo/jobs/MongoJobRepositoryTest.java @@ -18,20 +18,35 @@ import java.io.IOException; import java.time.OffsetDateTime; import java.time.ZoneOffset; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; import static de.otto.edison.jobs.domain.JobInfo.JobStatus.ERROR; import static de.otto.edison.jobs.domain.JobInfo.JobStatus.OK; import static de.otto.edison.jobs.domain.JobMessage.jobMessage; import static de.otto.edison.mongo.jobs.DateTimeConverters.toDate; -import static de.otto.edison.mongo.jobs.JobStructure.*; +import static de.otto.edison.mongo.jobs.JobStructure.ID; +import static de.otto.edison.mongo.jobs.JobStructure.JOB_TYPE; +import static de.otto.edison.mongo.jobs.JobStructure.MESSAGES; +import static de.otto.edison.mongo.jobs.JobStructure.MSG_LEVEL; +import static de.otto.edison.mongo.jobs.JobStructure.MSG_TEXT; +import static de.otto.edison.mongo.jobs.JobStructure.MSG_TS; +import static de.otto.edison.mongo.jobs.JobStructure.STATUS; import static java.time.Clock.systemDefaultZone; import static java.time.OffsetDateTime.now; import static java.time.temporal.ChronoUnit.SECONDS; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; public class MongoJobRepositoryTest { diff --git a/edison-mongo/src/test/java/de/otto/edison/mongo/togglz/MongoTogglzRepositoryTest.java b/edison-mongo/src/test/java/de/otto/edison/mongo/togglz/MongoTogglzRepositoryTest.java index c826fa613..44c32c6bc 100644 --- a/edison-mongo/src/test/java/de/otto/edison/mongo/togglz/MongoTogglzRepositoryTest.java +++ b/edison-mongo/src/test/java/de/otto/edison/mongo/togglz/MongoTogglzRepositoryTest.java @@ -17,8 +17,8 @@ import java.util.Optional; import java.util.UUID; -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; diff --git a/edison-testsupport/src/main/java/de/otto/edison/testsupport/util/JsonMap.java b/edison-testsupport/src/main/java/de/otto/edison/testsupport/util/JsonMap.java index 55c8f2abb..ae67ab763 100644 --- a/edison-testsupport/src/main/java/de/otto/edison/testsupport/util/JsonMap.java +++ b/edison-testsupport/src/main/java/de/otto/edison/testsupport/util/JsonMap.java @@ -1,7 +1,13 @@ package de.otto.edison.testsupport.util; import java.time.Instant; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import static java.time.Instant.parse; import static java.util.Collections.emptyMap; diff --git a/edison-testsupport/src/main/java/de/otto/edison/testsupport/util/Sets.java b/edison-testsupport/src/main/java/de/otto/edison/testsupport/util/Sets.java index a2fb1412f..fe61b9683 100644 --- a/edison-testsupport/src/main/java/de/otto/edison/testsupport/util/Sets.java +++ b/edison-testsupport/src/main/java/de/otto/edison/testsupport/util/Sets.java @@ -1,11 +1,9 @@ package de.otto.edison.testsupport.util; -import java.util.Collections; import java.util.HashSet; import java.util.Set; import static java.util.Arrays.asList; -import static java.util.Collections.addAll; public final class Sets { diff --git a/edison-togglz/src/test/java/de/otto/edison/togglz/DefaultTogglzConfigTest.java b/edison-togglz/src/test/java/de/otto/edison/togglz/DefaultTogglzConfigTest.java index 756de73e1..c785234cc 100644 --- a/edison-togglz/src/test/java/de/otto/edison/togglz/DefaultTogglzConfigTest.java +++ b/edison-togglz/src/test/java/de/otto/edison/togglz/DefaultTogglzConfigTest.java @@ -8,8 +8,8 @@ import static de.otto.edison.testsupport.dsl.Then.assertThat; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.typeCompatibleWith; import static org.hamcrest.core.Is.is; diff --git a/edison-togglz/src/test/java/de/otto/edison/togglz/controller/FeatureTogglesRepresentationTest.java b/edison-togglz/src/test/java/de/otto/edison/togglz/controller/FeatureTogglesRepresentationTest.java index b5e36c161..e6433375e 100644 --- a/edison-togglz/src/test/java/de/otto/edison/togglz/controller/FeatureTogglesRepresentationTest.java +++ b/edison-togglz/src/test/java/de/otto/edison/togglz/controller/FeatureTogglesRepresentationTest.java @@ -7,9 +7,9 @@ import java.util.Map; import static de.otto.edison.togglz.controller.FeatureTogglesRepresentation.togglzRepresentation; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; public class FeatureTogglesRepresentationTest { diff --git a/edison-validation/src/main/java/de/otto/edison/validation/validators/EachSafeId.java b/edison-validation/src/main/java/de/otto/edison/validation/validators/EachSafeId.java index 9a3a7d94d..a43f93f2e 100644 --- a/edison-validation/src/main/java/de/otto/edison/validation/validators/EachSafeId.java +++ b/edison-validation/src/main/java/de/otto/edison/validation/validators/EachSafeId.java @@ -5,7 +5,11 @@ import javax.validation.Constraint; import javax.validation.Payload; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Documented @EachConstraint(validateAs = SafeId.class) diff --git a/edison-validation/src/main/java/de/otto/edison/validation/validators/IsEnum.java b/edison-validation/src/main/java/de/otto/edison/validation/validators/IsEnum.java index 79bc27799..7aef955b5 100644 --- a/edison-validation/src/main/java/de/otto/edison/validation/validators/IsEnum.java +++ b/edison-validation/src/main/java/de/otto/edison/validation/validators/IsEnum.java @@ -2,7 +2,11 @@ import javax.validation.Constraint; import javax.validation.Payload; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Documented @Constraint(validatedBy = {EnumValidator.class}) diff --git a/edison-validation/src/main/java/de/otto/edison/validation/validators/IsInstant.java b/edison-validation/src/main/java/de/otto/edison/validation/validators/IsInstant.java index fa1b5ee12..cdc9e1ff7 100644 --- a/edison-validation/src/main/java/de/otto/edison/validation/validators/IsInstant.java +++ b/edison-validation/src/main/java/de/otto/edison/validation/validators/IsInstant.java @@ -2,7 +2,11 @@ import javax.validation.Constraint; import javax.validation.Payload; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Documented @Constraint(validatedBy = {InstantValidator.class}) diff --git a/edison-validation/src/main/java/de/otto/edison/validation/validators/SafeId.java b/edison-validation/src/main/java/de/otto/edison/validation/validators/SafeId.java index 4902d5aa1..bad579b12 100644 --- a/edison-validation/src/main/java/de/otto/edison/validation/validators/SafeId.java +++ b/edison-validation/src/main/java/de/otto/edison/validation/validators/SafeId.java @@ -2,7 +2,11 @@ import javax.validation.Constraint; import javax.validation.Payload; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Documented @Constraint(validatedBy = {SafeIdValidator.class}) diff --git a/edison-validation/src/main/java/de/otto/edison/validation/validators/SafeIdValidator.java b/edison-validation/src/main/java/de/otto/edison/validation/validators/SafeIdValidator.java index e56e6ba2c..fa63b78a6 100644 --- a/edison-validation/src/main/java/de/otto/edison/validation/validators/SafeIdValidator.java +++ b/edison-validation/src/main/java/de/otto/edison/validation/validators/SafeIdValidator.java @@ -2,7 +2,6 @@ import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import java.lang.annotation.Annotation; import java.util.regex.Pattern; public class SafeIdValidator implements ConstraintValidator { diff --git a/edison-validation/src/main/java/de/otto/edison/validation/web/ErrorHalRepresentation.java b/edison-validation/src/main/java/de/otto/edison/validation/web/ErrorHalRepresentation.java index ac18656f8..90ec11531 100644 --- a/edison-validation/src/main/java/de/otto/edison/validation/web/ErrorHalRepresentation.java +++ b/edison-validation/src/main/java/de/otto/edison/validation/web/ErrorHalRepresentation.java @@ -5,7 +5,11 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import de.otto.edison.hal.HalRepresentation; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL; import static de.otto.edison.hal.Link.profile; diff --git a/edison-validation/src/main/java/de/otto/edison/validation/web/ValidationExceptionHandler.java b/edison-validation/src/main/java/de/otto/edison/validation/web/ValidationExceptionHandler.java index 1770f8405..dd2389570 100644 --- a/edison-validation/src/main/java/de/otto/edison/validation/web/ValidationExceptionHandler.java +++ b/edison-validation/src/main/java/de/otto/edison/validation/web/ValidationExceptionHandler.java @@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.ResponseStatus; import static org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY; -import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8; import static org.springframework.http.ResponseEntity.unprocessableEntity; @ControllerAdvice diff --git a/edison-validation/src/test/java/de/otto/edison/validation/validators/EnumValidatorTest.java b/edison-validation/src/test/java/de/otto/edison/validation/validators/EnumValidatorTest.java index 8b0e00284..ac794c702 100644 --- a/edison-validation/src/test/java/de/otto/edison/validation/validators/EnumValidatorTest.java +++ b/edison-validation/src/test/java/de/otto/edison/validation/validators/EnumValidatorTest.java @@ -1,7 +1,5 @@ package de.otto.edison.validation.validators; -import org.hibernate.validator.internal.util.annotationfactory.AnnotationDescriptor; -import org.hibernate.validator.internal.util.annotationfactory.AnnotationFactory; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/edison-validation/src/test/java/de/otto/edison/validation/validators/SafeIdValidatorTest.java b/edison-validation/src/test/java/de/otto/edison/validation/validators/SafeIdValidatorTest.java index 315d8bd74..0847a9ab6 100644 --- a/edison-validation/src/test/java/de/otto/edison/validation/validators/SafeIdValidatorTest.java +++ b/edison-validation/src/test/java/de/otto/edison/validation/validators/SafeIdValidatorTest.java @@ -8,7 +8,6 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; @RunWith(Parameterized.class) public class SafeIdValidatorTest { diff --git a/examples/example-jobs/src/main/java/de/otto/edison/example/configuration/ExampleJobsConfiguration.java b/examples/example-jobs/src/main/java/de/otto/edison/example/configuration/ExampleJobsConfiguration.java index fedb13574..d657cdde3 100644 --- a/examples/example-jobs/src/main/java/de/otto/edison/example/configuration/ExampleJobsConfiguration.java +++ b/examples/example-jobs/src/main/java/de/otto/edison/example/configuration/ExampleJobsConfiguration.java @@ -1,13 +1,11 @@ package de.otto.edison.example.configuration; -import org.asynchttpclient.AsyncHttpClient; -import org.asynchttpclient.AsyncHttpClientConfig; - import de.otto.edison.jobs.repository.JobRepository; import de.otto.edison.jobs.repository.cleanup.KeepLastJobs; import de.otto.edison.jobs.repository.cleanup.StopDeadJobs; import de.otto.edison.jobs.service.JobMutexGroup; import de.otto.edison.jobs.service.JobService; +import org.asynchttpclient.AsyncHttpClient; import org.asynchttpclient.DefaultAsyncHttpClient; import org.asynchttpclient.DefaultAsyncHttpClientConfig; import org.springframework.beans.factory.annotation.Autowired; diff --git a/examples/example-status/src/main/java/de/otto/edison/example/service/HelloService.java b/examples/example-status/src/main/java/de/otto/edison/example/service/HelloService.java index 66f59ec26..27b621a11 100644 --- a/examples/example-status/src/main/java/de/otto/edison/example/service/HelloService.java +++ b/examples/example-status/src/main/java/de/otto/edison/example/service/HelloService.java @@ -7,7 +7,7 @@ import java.util.List; -import static de.otto.edison.status.domain.StatusDetail.*; +import static de.otto.edison.status.domain.StatusDetail.statusDetail; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; diff --git a/examples/example-status/src/main/java/de/otto/edison/example/status/AdditionalDetailStatusIndicator.java b/examples/example-status/src/main/java/de/otto/edison/example/status/AdditionalDetailStatusIndicator.java index 0ab04dfce..e22351150 100644 --- a/examples/example-status/src/main/java/de/otto/edison/example/status/AdditionalDetailStatusIndicator.java +++ b/examples/example-status/src/main/java/de/otto/edison/example/status/AdditionalDetailStatusIndicator.java @@ -4,13 +4,12 @@ import de.otto.edison.status.indicator.StatusDetailIndicator; import org.springframework.stereotype.Component; -import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import static de.otto.edison.status.domain.Status.OK; -import static de.otto.edison.status.domain.StatusDetail.*; -import static java.util.Collections.*; +import static de.otto.edison.status.domain.StatusDetail.statusDetail; +import static java.util.Collections.singletonList; /** * StatusDetails may contain additional information about the status. diff --git a/examples/example-status/src/main/java/de/otto/edison/example/status/WorkTimeStatusIndicator.java b/examples/example-status/src/main/java/de/otto/edison/example/status/WorkTimeStatusIndicator.java index 80fb0d110..049ee9901 100644 --- a/examples/example-status/src/main/java/de/otto/edison/example/status/WorkTimeStatusIndicator.java +++ b/examples/example-status/src/main/java/de/otto/edison/example/status/WorkTimeStatusIndicator.java @@ -5,12 +5,11 @@ import org.springframework.stereotype.Component; import java.time.LocalTime; -import java.util.Collections; import java.util.List; 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.*; +import static de.otto.edison.status.domain.StatusDetail.statusDetail; import static java.time.LocalTime.now; import static java.util.Collections.singletonList; diff --git a/examples/example-status/src/main/java/de/otto/edison/example/web/ExampleController.java b/examples/example-status/src/main/java/de/otto/edison/example/web/ExampleController.java index 714783e64..2b0ea50e9 100644 --- a/examples/example-status/src/main/java/de/otto/edison/example/web/ExampleController.java +++ b/examples/example-status/src/main/java/de/otto/edison/example/web/ExampleController.java @@ -2,7 +2,6 @@ import io.micrometer.core.annotation.Timed; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; diff --git a/examples/example-togglz/src/main/java/de/otto/edison/example/ExampleTogglzServer.java b/examples/example-togglz/src/main/java/de/otto/edison/example/ExampleTogglzServer.java index e51f9a19e..6c6dcc135 100644 --- a/examples/example-togglz/src/main/java/de/otto/edison/example/ExampleTogglzServer.java +++ b/examples/example-togglz/src/main/java/de/otto/edison/example/ExampleTogglzServer.java @@ -1,7 +1,6 @@ package de.otto.edison.example; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.PropertySource; import org.springframework.scheduling.annotation.EnableScheduling;