diff --git a/configurations/hibernate-gorm/src/test/groovy/io/micronaut/configuration/hibernate/gorm/GormConfigSpec.groovy b/configurations/hibernate-gorm/src/test/groovy/io/micronaut/configuration/hibernate/gorm/GormConfigSpec.groovy index 4a7182bc60f..fb2dfb75cca 100644 --- a/configurations/hibernate-gorm/src/test/groovy/io/micronaut/configuration/hibernate/gorm/GormConfigSpec.groovy +++ b/configurations/hibernate-gorm/src/test/groovy/io/micronaut/configuration/hibernate/gorm/GormConfigSpec.groovy @@ -18,19 +18,13 @@ package io.micronaut.configuration.hibernate.gorm import grails.gorm.annotation.Entity import grails.gorm.services.Service import grails.gorm.transactions.TransactionService -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.annotation.Value -import io.micronaut.context.env.PropertySource import org.grails.datastore.mapping.validation.ValidationException import org.grails.orm.hibernate.cfg.Settings import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext import io.micronaut.context.annotation.Value -import io.micronaut.context.env.MapPropertySource import io.micronaut.context.env.PropertySource import org.springframework.transaction.PlatformTransactionManager -import spock.lang.Ignore import spock.lang.Specification import javax.inject.Singleton diff --git a/configurations/hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/JpaSetupSpec.groovy b/configurations/hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/JpaSetupSpec.groovy index d2a764fdb3b..0eae61bb952 100644 --- a/configurations/hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/JpaSetupSpec.groovy +++ b/configurations/hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/JpaSetupSpec.groovy @@ -17,7 +17,6 @@ package io.micronaut.configuration.hibernate.jpa import io.micronaut.context.ApplicationContext import io.micronaut.context.exceptions.BeanContextException -import io.micronaut.core.convert.ConversionService import io.micronaut.core.util.CollectionUtils import io.micronaut.http.exceptions.ConnectionClosedException import io.micronaut.http.exceptions.HttpException diff --git a/configurations/hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/MultipleDataSourceJpaSetupSpec.groovy b/configurations/hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/MultipleDataSourceJpaSetupSpec.groovy index 273a2616e61..f4d0320942a 100644 --- a/configurations/hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/MultipleDataSourceJpaSetupSpec.groovy +++ b/configurations/hibernate-jpa/src/test/groovy/io/micronaut/configuration/hibernate/jpa/MultipleDataSourceJpaSetupSpec.groovy @@ -23,8 +23,6 @@ import spock.lang.AutoCleanup import spock.lang.Shared import spock.lang.Specification -import javax.sql.DataSource - /** * @author graemerocher * @since 1.0 diff --git a/configurations/hibernate-validator/src/test/groovy/io/micronaut/configuration/hibernate/validator/ValidatedBeanSpec.groovy b/configurations/hibernate-validator/src/test/groovy/io/micronaut/configuration/hibernate/validator/ValidatedBeanSpec.groovy index e67d41c51b0..2413eac6f2b 100644 --- a/configurations/hibernate-validator/src/test/groovy/io/micronaut/configuration/hibernate/validator/ValidatedBeanSpec.groovy +++ b/configurations/hibernate-validator/src/test/groovy/io/micronaut/configuration/hibernate/validator/ValidatedBeanSpec.groovy @@ -15,11 +15,6 @@ */ package io.micronaut.configuration.hibernate.validator -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.annotation.Value -import io.micronaut.context.exceptions.BeanInstantiationException -import org.hibernate.validator.constraints.NotBlank import org.hibernate.validator.constraints.URL import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext diff --git a/configurations/jdbc-dbcp/src/test/groovy/io/micronaut/configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy b/configurations/jdbc-dbcp/src/test/groovy/io/micronaut/configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy index ab0f905fcf0..7886ca52cdb 100644 --- a/configurations/jdbc-dbcp/src/test/groovy/io/micronaut/configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy +++ b/configurations/jdbc-dbcp/src/test/groovy/io/micronaut/configuration/jdbc/dbcp/DatasourceConfigurationSpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.configuration.jdbc.dbcp -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.MapPropertySource -import io.micronaut.inject.qualifiers.Qualifiers import org.apache.commons.dbcp2.BasicDataSource import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext diff --git a/configurations/jdbc-hikari/src/test/groovy/io/micronaut/configuration/jdbc/hikari/DatasourceConfigurationSpec.groovy b/configurations/jdbc-hikari/src/test/groovy/io/micronaut/configuration/jdbc/hikari/DatasourceConfigurationSpec.groovy index c94c1831f2f..d8db2f9ea66 100644 --- a/configurations/jdbc-hikari/src/test/groovy/io/micronaut/configuration/jdbc/hikari/DatasourceConfigurationSpec.groovy +++ b/configurations/jdbc-hikari/src/test/groovy/io/micronaut/configuration/jdbc/hikari/DatasourceConfigurationSpec.groovy @@ -20,11 +20,6 @@ import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext import io.micronaut.context.env.MapPropertySource import io.micronaut.inject.qualifiers.Qualifiers -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.MapPropertySource -import io.micronaut.inject.qualifiers.Qualifiers -import spock.lang.Ignore import spock.lang.Specification import java.sql.ResultSet diff --git a/configurations/jdbc-tomcat/src/test/groovy/io/micronaut/configuration/jdbc/tomcat/DatasourceConfigurationSpec.groovy b/configurations/jdbc-tomcat/src/test/groovy/io/micronaut/configuration/jdbc/tomcat/DatasourceConfigurationSpec.groovy index 9b773231193..7a16d4a5dbf 100644 --- a/configurations/jdbc-tomcat/src/test/groovy/io/micronaut/configuration/jdbc/tomcat/DatasourceConfigurationSpec.groovy +++ b/configurations/jdbc-tomcat/src/test/groovy/io/micronaut/configuration/jdbc/tomcat/DatasourceConfigurationSpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.configuration.jdbc.tomcat -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.MapPropertySource -import io.micronaut.inject.qualifiers.Qualifiers import org.apache.tomcat.jdbc.pool.DataSource import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext diff --git a/configurations/mongo-reactive/src/test/groovy/io/micronaut/configuration/mongo/reactive/MongoConfigurationSpec.groovy b/configurations/mongo-reactive/src/test/groovy/io/micronaut/configuration/mongo/reactive/MongoConfigurationSpec.groovy index 50b7786b817..1b81c8f371c 100644 --- a/configurations/mongo-reactive/src/test/groovy/io/micronaut/configuration/mongo/reactive/MongoConfigurationSpec.groovy +++ b/configurations/mongo-reactive/src/test/groovy/io/micronaut/configuration/mongo/reactive/MongoConfigurationSpec.groovy @@ -18,10 +18,8 @@ package io.micronaut.configuration.mongo.reactive import com.mongodb.MongoClient import com.mongodb.MongoClientOptions -import com.mongodb.client.MongoCollection import io.micronaut.context.ApplicationContext import io.micronaut.core.io.socket.SocketUtils -import io.reactivex.Flowable import org.bson.Document import spock.lang.IgnoreIf import spock.lang.Specification diff --git a/configurations/neo4j-bolt/src/test/groovy/io/micronaut/configuration/neo4j/bolt/Neo4jBoltConfigurationSpec.groovy b/configurations/neo4j-bolt/src/test/groovy/io/micronaut/configuration/neo4j/bolt/Neo4jBoltConfigurationSpec.groovy index 4b4526947ba..23946069702 100644 --- a/configurations/neo4j-bolt/src/test/groovy/io/micronaut/configuration/neo4j/bolt/Neo4jBoltConfigurationSpec.groovy +++ b/configurations/neo4j-bolt/src/test/groovy/io/micronaut/configuration/neo4j/bolt/Neo4jBoltConfigurationSpec.groovy @@ -16,7 +16,6 @@ package io.micronaut.configuration.neo4j.bolt -import io.micronaut.context.ApplicationContext import io.micronaut.context.ApplicationContext import spock.lang.Specification diff --git a/configurations/neo4j-bolt/src/test/groovy/io/micronaut/configuration/neo4j/bolt/Neo4jEmbeddedServerSpec.groovy b/configurations/neo4j-bolt/src/test/groovy/io/micronaut/configuration/neo4j/bolt/Neo4jEmbeddedServerSpec.groovy index df19cdd20da..fdeb2581d1a 100644 --- a/configurations/neo4j-bolt/src/test/groovy/io/micronaut/configuration/neo4j/bolt/Neo4jEmbeddedServerSpec.groovy +++ b/configurations/neo4j-bolt/src/test/groovy/io/micronaut/configuration/neo4j/bolt/Neo4jEmbeddedServerSpec.groovy @@ -16,8 +16,6 @@ package io.micronaut.configuration.neo4j.bolt -import io.micronaut.context.ApplicationContext -import io.micronaut.core.io.socket.SocketUtils import org.neo4j.driver.v1.Driver import io.micronaut.context.ApplicationContext import io.micronaut.core.io.socket.SocketUtils diff --git a/configurations/neo4j-bolt/src/test/groovy/io/micronaut/configuration/neo4j/bolt/health/Neo4jHealthIndicatorSpec.groovy b/configurations/neo4j-bolt/src/test/groovy/io/micronaut/configuration/neo4j/bolt/health/Neo4jHealthIndicatorSpec.groovy index d06363642b2..0b13b449837 100644 --- a/configurations/neo4j-bolt/src/test/groovy/io/micronaut/configuration/neo4j/bolt/health/Neo4jHealthIndicatorSpec.groovy +++ b/configurations/neo4j-bolt/src/test/groovy/io/micronaut/configuration/neo4j/bolt/health/Neo4jHealthIndicatorSpec.groovy @@ -22,7 +22,6 @@ import io.micronaut.core.io.socket.SocketUtils import io.micronaut.health.HealthStatus import io.micronaut.management.health.indicator.HealthResult import io.reactivex.Flowable -import org.neo4j.driver.v1.Driver import spock.lang.Specification /** diff --git a/configurations/netflix-hystrix/src/test/groovy/io/micronaut/configurations/hystrix/HystrixCommandSpec.groovy b/configurations/netflix-hystrix/src/test/groovy/io/micronaut/configurations/hystrix/HystrixCommandSpec.groovy index 9a3f5dd5daa..b6c1ddf4d5a 100644 --- a/configurations/netflix-hystrix/src/test/groovy/io/micronaut/configurations/hystrix/HystrixCommandSpec.groovy +++ b/configurations/netflix-hystrix/src/test/groovy/io/micronaut/configurations/hystrix/HystrixCommandSpec.groovy @@ -18,12 +18,6 @@ package io.micronaut.configurations.hystrix import com.netflix.hystrix.HystrixInvokable import com.netflix.hystrix.exception.HystrixRuntimeException import com.netflix.hystrix.strategy.executionhook.HystrixCommandExecutionHook -import io.micronaut.configurations.hystrix.annotation.Hystrix -import io.micronaut.configurations.hystrix.annotation.HystrixCommand -import io.micronaut.context.ApplicationContext -import io.micronaut.context.annotation.Property -import io.micronaut.retry.annotation.Fallback -import io.micronaut.retry.annotation.Retryable import io.reactivex.Flowable import io.reactivex.Maybe import io.reactivex.Observable diff --git a/configurations/netflix-hystrix/src/test/groovy/io/micronaut/configurations/hystrix/HystrixStreamControllerSpec.groovy b/configurations/netflix-hystrix/src/test/groovy/io/micronaut/configurations/hystrix/HystrixStreamControllerSpec.groovy index f999346a496..3457d6bd076 100644 --- a/configurations/netflix-hystrix/src/test/groovy/io/micronaut/configurations/hystrix/HystrixStreamControllerSpec.groovy +++ b/configurations/netflix-hystrix/src/test/groovy/io/micronaut/configurations/hystrix/HystrixStreamControllerSpec.groovy @@ -15,17 +15,11 @@ */ package io.micronaut.configurations.hystrix -import io.micronaut.context.ApplicationContext -import io.micronaut.core.io.buffer.ByteBuffer -import io.micronaut.http.HttpRequest -import io.micronaut.http.client.RxStreamingHttpClient import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.core.io.buffer.ByteBuffer import io.micronaut.http.HttpRequest -import io.micronaut.http.client.HttpClient import io.micronaut.http.client.RxStreamingHttpClient -import io.micronaut.http.client.StreamingHttpClient import io.micronaut.runtime.server.EmbeddedServer import org.reactivestreams.Subscriber import org.reactivestreams.Subscription diff --git a/configurations/netflix-ribbon/src/test/groovy/io/micronaut/configurations/ribbon/RibbonConfigSpec.groovy b/configurations/netflix-ribbon/src/test/groovy/io/micronaut/configurations/ribbon/RibbonConfigSpec.groovy index 0b3be466bd2..3608ac71fab 100644 --- a/configurations/netflix-ribbon/src/test/groovy/io/micronaut/configurations/ribbon/RibbonConfigSpec.groovy +++ b/configurations/netflix-ribbon/src/test/groovy/io/micronaut/configurations/ribbon/RibbonConfigSpec.groovy @@ -29,8 +29,6 @@ import io.micronaut.context.annotation.Prototype import io.micronaut.inject.qualifiers.Qualifiers import spock.lang.Specification -import javax.inject.Singleton - /** * @author graemerocher * @since 1.0 diff --git a/configurations/netflix-ribbon/src/test/groovy/io/micronaut/configurations/ribbon/RibbonRxHttpClientSpec.groovy b/configurations/netflix-ribbon/src/test/groovy/io/micronaut/configurations/ribbon/RibbonRxHttpClientSpec.groovy index 687e11552b5..65c34b84faf 100644 --- a/configurations/netflix-ribbon/src/test/groovy/io/micronaut/configurations/ribbon/RibbonRxHttpClientSpec.groovy +++ b/configurations/netflix-ribbon/src/test/groovy/io/micronaut/configurations/ribbon/RibbonRxHttpClientSpec.groovy @@ -22,10 +22,8 @@ import io.micronaut.context.ApplicationContext import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Get import io.micronaut.http.client.Client -import io.micronaut.http.client.HttpClient import io.micronaut.http.client.RxHttpClient import io.micronaut.runtime.server.EmbeddedServer -import spock.lang.Shared import spock.lang.Specification import spock.util.concurrent.PollingConditions diff --git a/configurations/redis-lettuce/src/test/groovy/io/micronaut/configuration/lettuce/RedisClientFactorySpec.groovy b/configurations/redis-lettuce/src/test/groovy/io/micronaut/configuration/lettuce/RedisClientFactorySpec.groovy index a2c624c3a5a..dc9978ff372 100644 --- a/configurations/redis-lettuce/src/test/groovy/io/micronaut/configuration/lettuce/RedisClientFactorySpec.groovy +++ b/configurations/redis-lettuce/src/test/groovy/io/micronaut/configuration/lettuce/RedisClientFactorySpec.groovy @@ -16,7 +16,6 @@ package io.micronaut.configuration.lettuce -import io.lettuce.core.RedisClient import io.lettuce.core.api.StatefulRedisConnection import io.micronaut.context.ApplicationContext import io.micronaut.core.io.socket.SocketUtils diff --git a/configurations/redis-lettuce/src/test/groovy/io/micronaut/configuration/lettuce/cache/RedisCacheSpec.groovy b/configurations/redis-lettuce/src/test/groovy/io/micronaut/configuration/lettuce/cache/RedisCacheSpec.groovy index edad0085b90..7d098bd4bb8 100644 --- a/configurations/redis-lettuce/src/test/groovy/io/micronaut/configuration/lettuce/cache/RedisCacheSpec.groovy +++ b/configurations/redis-lettuce/src/test/groovy/io/micronaut/configuration/lettuce/cache/RedisCacheSpec.groovy @@ -16,11 +16,8 @@ package io.micronaut.configuration.lettuce.cache -import io.lettuce.core.RedisClient import io.micronaut.context.ApplicationContext -import io.micronaut.core.io.socket.SocketUtils import io.micronaut.inject.qualifiers.Qualifiers -import redis.embedded.RedisServer import spock.lang.AutoCleanup import spock.lang.Shared import spock.lang.Specification diff --git a/configurations/redis-lettuce/src/test/groovy/io/micronaut/configuration/lettuce/cache/SyncCacheSpec.groovy b/configurations/redis-lettuce/src/test/groovy/io/micronaut/configuration/lettuce/cache/SyncCacheSpec.groovy index 668d72feb22..fb96c27eca1 100644 --- a/configurations/redis-lettuce/src/test/groovy/io/micronaut/configuration/lettuce/cache/SyncCacheSpec.groovy +++ b/configurations/redis-lettuce/src/test/groovy/io/micronaut/configuration/lettuce/cache/SyncCacheSpec.groovy @@ -16,11 +16,8 @@ package io.micronaut.configuration.lettuce.cache -import io.micronaut.cache.SyncCache import io.micronaut.context.ApplicationContext import io.micronaut.core.io.socket.SocketUtils -import io.micronaut.inject.qualifiers.Qualifiers -import redis.embedded.RedisServer import spock.lang.AutoCleanup import spock.lang.Shared import spock.lang.Specification diff --git a/core/src/test/groovy/io/micronaut/core/io/scan/ClassPathScannerSpec.groovy b/core/src/test/groovy/io/micronaut/core/io/scan/ClassPathScannerSpec.groovy index bc9cab0d900..43ab83c2a2c 100644 --- a/core/src/test/groovy/io/micronaut/core/io/scan/ClassPathScannerSpec.groovy +++ b/core/src/test/groovy/io/micronaut/core/io/scan/ClassPathScannerSpec.groovy @@ -17,8 +17,6 @@ package io.micronaut.core.io.scan import groovy.transform.AutoClone -import io.micronaut.core.io.scan.nested.Foo2 -import io.micronaut.core.io.scan2.Foo3 import org.codehaus.groovy.transform.GroovyASTTransformation import io.micronaut.core.io.scan.nested.Foo2 import io.micronaut.core.io.scan2.Foo3 diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/cloud/AmazonEC2InstanceResolverSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/cloud/AmazonEC2InstanceResolverSpec.groovy index 733140bee2c..2794bd9e0f1 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/cloud/AmazonEC2InstanceResolverSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/cloud/AmazonEC2InstanceResolverSpec.groovy @@ -16,9 +16,6 @@ package io.micronaut.discovery.cloud import com.fasterxml.jackson.databind.ObjectMapper -import io.micronaut.context.env.Environment -import io.micronaut.discovery.cloud.aws.AmazonComputeInstanceMetadataResolver -import io.micronaut.discovery.cloud.aws.AmazonMetadataConfiguration import io.micronaut.context.env.ComputePlatform import io.micronaut.context.env.Environment import io.micronaut.discovery.cloud.aws.AmazonComputeInstanceMetadataResolver diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/cloud/GoogleComputeInstanceResolverSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/cloud/GoogleComputeInstanceResolverSpec.groovy index 758707aee6e..8a958e5d797 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/cloud/GoogleComputeInstanceResolverSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/cloud/GoogleComputeInstanceResolverSpec.groovy @@ -16,9 +16,6 @@ package io.micronaut.discovery.cloud import com.fasterxml.jackson.databind.ObjectMapper -import io.micronaut.context.env.Environment -import io.micronaut.discovery.cloud.gcp.GoogleComputeInstanceMetadataResolver -import io.micronaut.discovery.cloud.gcp.GoogleComputeMetadataConfiguration import io.micronaut.context.env.ComputePlatform import io.micronaut.context.env.Environment import io.micronaut.discovery.cloud.gcp.GoogleComputeInstanceMetadataResolver diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ClientScopeSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ClientScopeSpec.groovy index c802333fb61..32ee4882cdd 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ClientScopeSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ClientScopeSpec.groovy @@ -21,7 +21,6 @@ import io.micronaut.http.annotation.Get import io.micronaut.http.client.Client import io.micronaut.http.client.RxHttpClient import io.micronaut.runtime.server.EmbeddedServer -import io.reactivex.Flowable import spock.lang.IgnoreIf import spock.lang.Specification diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulAutoRegistrationSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulAutoRegistrationSpec.groovy index c2b4c0f70fc..82ef3a48452 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulAutoRegistrationSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulAutoRegistrationSpec.groovy @@ -15,19 +15,14 @@ */ package io.micronaut.discovery.consul -import io.micronaut.context.ApplicationContext -import io.micronaut.discovery.consul.client.v1.ConsulClient import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.discovery.DiscoveryClient import io.micronaut.discovery.ServiceInstance import io.micronaut.discovery.consul.client.v1.ConsulClient import io.micronaut.runtime.server.EmbeddedServer -import spock.lang.AutoCleanup import spock.lang.IgnoreIf -import spock.lang.Shared import spock.lang.Specification -import spock.lang.Stepwise import spock.util.concurrent.PollingConditions /** diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulClientSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulClientSpec.groovy index c0df5881d01..20af7de695f 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulClientSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulClientSpec.groovy @@ -15,23 +15,13 @@ */ package io.micronaut.discovery.consul -import io.micronaut.context.ApplicationContext -import io.micronaut.discovery.consul.client.v1.CatalogEntry -import io.micronaut.discovery.consul.client.v1.ConsulClient -import io.micronaut.discovery.consul.client.v1.HTTPCheck -import io.micronaut.discovery.consul.client.v1.HealthEntry -import io.micronaut.discovery.consul.client.v1.NewServiceEntry -import io.micronaut.discovery.consul.client.v1.ServiceEntry -import io.micronaut.http.HttpStatus -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Get import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.discovery.CompositeDiscoveryClient import io.micronaut.discovery.DiscoveryClient import io.micronaut.discovery.ServiceInstance import io.micronaut.http.HttpStatus -import io.micronaut.discovery.consul.client.v1.*; +import io.micronaut.discovery.consul.client.v1.* import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Get import io.micronaut.runtime.server.EmbeddedServer diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulHealthStatusSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulHealthStatusSpec.groovy index ba1db87751a..356a5af9a07 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulHealthStatusSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulHealthStatusSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.discovery.consul -import io.micronaut.context.ApplicationContext -import io.micronaut.discovery.consul.client.v1.ConsulClient -import io.micronaut.http.HttpStatus import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.discovery.consul.client.v1.ConsulClient diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulMockAutoRegistrationSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulMockAutoRegistrationSpec.groovy index 01b1b8d78c2..572381aed80 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulMockAutoRegistrationSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulMockAutoRegistrationSpec.groovy @@ -15,19 +15,8 @@ */ package io.micronaut.discovery.consul -import io.micronaut.context.ApplicationContext -import io.micronaut.core.io.socket.SocketUtils -import io.micronaut.discovery.consul.client.v1.ConsulClient -import io.micronaut.discovery.consul.client.v1.HTTPCheck -import io.micronaut.discovery.consul.client.v1.HealthEntry -import io.micronaut.discovery.consul.client.v1.NewServiceEntry -import io.micronaut.http.HttpMethod -import io.micronaut.http.HttpStatus -import io.micronaut.http.client.HttpClient -import io.micronaut.http.client.exceptions.HttpClientResponseException import io.reactivex.Flowable import io.micronaut.context.ApplicationContext -import io.micronaut.context.annotation.Requires import io.micronaut.core.io.socket.SocketUtils import io.micronaut.discovery.DiscoveryClient import io.micronaut.discovery.ServiceInstance @@ -35,7 +24,6 @@ import io.micronaut.discovery.consul.client.v1.ConsulClient import io.micronaut.discovery.consul.client.v1.HTTPCheck import io.micronaut.discovery.consul.client.v1.HealthEntry import io.micronaut.discovery.consul.client.v1.NewServiceEntry -import io.micronaut.discovery.consul.client.v1.TTLCheck import io.micronaut.http.HttpMethod import io.micronaut.http.HttpStatus import io.micronaut.http.client.HttpClient @@ -44,7 +32,6 @@ import io.micronaut.runtime.server.EmbeddedServer import spock.lang.AutoCleanup import spock.lang.Shared import spock.lang.Specification -import spock.lang.Stepwise import spock.util.concurrent.PollingConditions import java.time.Duration diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulMockConfigurationClientFilesSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulMockConfigurationClientFilesSpec.groovy index 639caf97082..c09abf38c93 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulMockConfigurationClientFilesSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulMockConfigurationClientFilesSpec.groovy @@ -17,13 +17,10 @@ package io.micronaut.discovery.consul import io.micronaut.context.ApplicationContext import io.micronaut.context.env.Environment -import io.micronaut.context.env.EnvironmentPropertySource import io.micronaut.context.env.PropertySource -import io.micronaut.context.exceptions.ConfigurationException import io.micronaut.core.io.socket.SocketUtils import io.micronaut.discovery.config.ConfigurationClient import io.micronaut.discovery.consul.client.v1.ConsulClient -import io.micronaut.discovery.consul.config.ConsulConfigurationClient import io.micronaut.runtime.server.EmbeddedServer import io.reactivex.Flowable import spock.lang.AutoCleanup diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulMockHealthStatusSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulMockHealthStatusSpec.groovy index 3fc7f97dba3..739e5dc1bd9 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulMockHealthStatusSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/ConsulMockHealthStatusSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.discovery.consul -import io.micronaut.context.ApplicationContext -import io.micronaut.discovery.consul.client.v1.ConsulClient -import io.micronaut.http.HttpStatus import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.discovery.consul.client.v1.ConsulClient diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/MockConfigurationDiscoverySpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/MockConfigurationDiscoverySpec.groovy index 9da33792df3..742cf82d84d 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/MockConfigurationDiscoverySpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/MockConfigurationDiscoverySpec.groovy @@ -15,9 +15,7 @@ */ package io.micronaut.discovery.consul -import groovy.transform.NotYetImplemented import io.micronaut.context.ApplicationContext -import io.micronaut.context.env.Environment import io.micronaut.core.io.socket.SocketUtils import io.micronaut.discovery.config.ConfigurationClient import io.micronaut.discovery.consul.client.v1.ConsulClient diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/TtlHeartbeatSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/TtlHeartbeatSpec.groovy index 22ad28da45c..01238f39869 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/consul/TtlHeartbeatSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/consul/TtlHeartbeatSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.discovery.consul -import io.micronaut.context.ApplicationContext import io.micronaut.core.naming.NameUtils import io.reactivex.Flowable import io.micronaut.context.ApplicationContext diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaAutoRegistrationSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaAutoRegistrationSpec.groovy index 2211fe884a6..b70fc539c1a 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaAutoRegistrationSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaAutoRegistrationSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.discovery.eureka -import io.micronaut.context.ApplicationContext -import io.micronaut.discovery.eureka.client.v2.EurekaClient import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.discovery.eureka.client.v2.EurekaClient diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaClientConfigSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaClientConfigSpec.groovy index 3979467faaa..da468c5c59d 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaClientConfigSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaClientConfigSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.discovery.eureka -import io.micronaut.context.ApplicationContext -import io.micronaut.discovery.eureka.client.v2.EurekaClient import io.micronaut.context.ApplicationContext import io.micronaut.discovery.ServiceInstance import io.micronaut.discovery.eureka.client.v2.EurekaClient diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaClientSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaClientSpec.groovy index c59dc05d4a9..707505ba883 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaClientSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaClientSpec.groovy @@ -15,11 +15,6 @@ */ package io.micronaut.discovery.eureka -import io.micronaut.context.ApplicationContext -import io.micronaut.discovery.eureka.client.v2.ApplicationInfo -import io.micronaut.discovery.eureka.client.v2.EurekaClient -import io.micronaut.discovery.eureka.client.v2.InstanceInfo -import io.micronaut.http.HttpStatus import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.discovery.CompositeDiscoveryClient diff --git a/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaMockBasicAuthSpec.groovy b/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaMockBasicAuthSpec.groovy index eeb8e5da35e..4c01396af79 100644 --- a/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaMockBasicAuthSpec.groovy +++ b/discovery-client/src/test/groovy/io/micronaut/discovery/eureka/EurekaMockBasicAuthSpec.groovy @@ -15,11 +15,6 @@ */ package io.micronaut.discovery.eureka -import io.micronaut.context.ApplicationContext -import io.micronaut.discovery.eureka.client.v2.EurekaClient -import io.micronaut.http.HttpStatus -import io.micronaut.http.client.HttpClient -import io.micronaut.http.client.exceptions.HttpClientResponseException import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.discovery.eureka.client.v2.EurekaClient diff --git a/examples/hello-world-lambda/src/test/groovy/example/HelloWorldFunctionSpec.groovy b/examples/hello-world-lambda/src/test/groovy/example/HelloWorldFunctionSpec.groovy index bdc0193b5fe..fc9c5b85326 100644 --- a/examples/hello-world-lambda/src/test/groovy/example/HelloWorldFunctionSpec.groovy +++ b/examples/hello-world-lambda/src/test/groovy/example/HelloWorldFunctionSpec.groovy @@ -16,8 +16,6 @@ package example import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.client.HttpClient import io.micronaut.runtime.server.EmbeddedServer import spock.lang.IgnoreIf import spock.lang.Specification diff --git a/function-client/src/test/groovy/io/micronaut/function/client/aws/AwsLambdaInvokeSpec.groovy b/function-client/src/test/groovy/io/micronaut/function/client/aws/AwsLambdaInvokeSpec.groovy index 3cf586390de..c6f49a56f55 100644 --- a/function-client/src/test/groovy/io/micronaut/function/client/aws/AwsLambdaInvokeSpec.groovy +++ b/function-client/src/test/groovy/io/micronaut/function/client/aws/AwsLambdaInvokeSpec.groovy @@ -16,11 +16,6 @@ package io.micronaut.function.client.aws -import io.micronaut.context.ApplicationContext -import io.micronaut.core.type.Argument -import io.micronaut.function.client.FunctionClient -import io.micronaut.function.client.FunctionDefinition -import io.micronaut.http.annotation.Body import io.reactivex.Single import io.micronaut.context.ApplicationContext import io.micronaut.core.type.Argument diff --git a/function-web/src/test/groovy/io/micronaut/function/web/WebFunctionSpec.groovy b/function-web/src/test/groovy/io/micronaut/function/web/WebFunctionSpec.groovy index ded6b9a8cf9..4f17925b3e2 100644 --- a/function-web/src/test/groovy/io/micronaut/function/web/WebFunctionSpec.groovy +++ b/function-web/src/test/groovy/io/micronaut/function/web/WebFunctionSpec.groovy @@ -17,14 +17,6 @@ package io.micronaut.function.web import groovy.transform.EqualsAndHashCode import io.micronaut.context.ApplicationContext -import io.micronaut.function.LocalFunctionRegistry -import io.micronaut.http.HttpHeaders -import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpResponse -import io.micronaut.http.HttpStatus -import io.micronaut.http.MediaType -import io.micronaut.http.client.RxHttpClient -import io.micronaut.context.ApplicationContext import io.micronaut.function.FunctionBean import io.micronaut.function.LocalFunctionRegistry import io.micronaut.http.HttpHeaders diff --git a/http-client/src/test/groovy/io/micronaut/http/client/ClientIntroductionAdviceSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/ClientIntroductionAdviceSpec.groovy index 2e02c290841..01cbc008eab 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/ClientIntroductionAdviceSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/ClientIntroductionAdviceSpec.groovy @@ -19,19 +19,11 @@ import io.micronaut.context.ApplicationContext import io.micronaut.http.MediaType import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Get -import io.micronaut.context.ApplicationContext -import io.micronaut.core.io.socket.SocketUtils -import io.micronaut.http.MediaType -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Get -import io.micronaut.inject.qualifiers.Qualifiers import io.micronaut.runtime.server.EmbeddedServer import spock.lang.AutoCleanup import spock.lang.Shared import spock.lang.Specification -import javax.inject.Singleton - /** * TODO: Javadoc description * diff --git a/http-client/src/test/groovy/io/micronaut/http/client/ClientScopeSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/ClientScopeSpec.groovy index 4f3d46e5b08..a541086c037 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/ClientScopeSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/ClientScopeSpec.groovy @@ -15,11 +15,6 @@ */ package io.micronaut.http.client -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.MediaType -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Get import io.micronaut.context.ApplicationContext import io.micronaut.core.io.socket.SocketUtils import io.micronaut.http.HttpRequest diff --git a/http-client/src/test/groovy/io/micronaut/http/client/DataStreamSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/DataStreamSpec.groovy index 7d462685419..2e7e11569d0 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/DataStreamSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/DataStreamSpec.groovy @@ -15,15 +15,8 @@ */ package io.micronaut.http.client -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.MediaType -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Get import io.reactivex.Flowable import io.reactivex.internal.operators.flowable.FlowableBlockingSubscribe -import io.reactivex.internal.subscribers.BlockingFirstSubscriber -import io.reactivex.internal.subscribers.BlockingSubscriber import io.micronaut.context.ApplicationContext import io.micronaut.core.io.buffer.ByteBuffer import io.micronaut.http.HttpRequest diff --git a/http-client/src/test/groovy/io/micronaut/http/client/HttpDeleteSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/HttpDeleteSpec.groovy index 1e093dc624c..e5c68e69327 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/HttpDeleteSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/HttpDeleteSpec.groovy @@ -15,14 +15,6 @@ */ package io.micronaut.http.client -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpResponse -import io.micronaut.http.HttpStatus -import io.micronaut.http.MediaType -import io.micronaut.http.annotation.Body -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Delete import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest diff --git a/http-client/src/test/groovy/io/micronaut/http/client/HttpPatchSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/HttpPatchSpec.groovy index 6bb4850f5ef..af80ce6d126 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/HttpPatchSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/HttpPatchSpec.groovy @@ -16,15 +16,6 @@ package io.micronaut.http.client import groovy.transform.EqualsAndHashCode -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpResponse -import io.micronaut.http.HttpStatus -import io.micronaut.http.MediaType -import io.micronaut.http.annotation.Body -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Header -import io.micronaut.http.annotation.Patch import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest diff --git a/http-client/src/test/groovy/io/micronaut/http/client/HttpPostSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/HttpPostSpec.groovy index 22bd7dd93a8..ce028566886 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/HttpPostSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/HttpPostSpec.groovy @@ -16,16 +16,6 @@ package io.micronaut.http.client import groovy.transform.EqualsAndHashCode -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpResponse -import io.micronaut.http.HttpStatus -import io.micronaut.http.MediaType -import io.micronaut.http.annotation.Body -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Header -import io.micronaut.http.annotation.Post -import io.micronaut.http.client.exceptions.HttpClientException import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest diff --git a/http-client/src/test/groovy/io/micronaut/http/client/HttpPutSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/HttpPutSpec.groovy index bd0e6b6322a..1e1fc916852 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/HttpPutSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/HttpPutSpec.groovy @@ -16,16 +16,6 @@ package io.micronaut.http.client import groovy.transform.EqualsAndHashCode -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpResponse -import io.micronaut.http.HttpStatus -import io.micronaut.http.MediaType -import io.micronaut.http.annotation.Body -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Header -import io.micronaut.http.annotation.Put -import io.micronaut.http.client.exceptions.HttpClientException import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest diff --git a/http-client/src/test/groovy/io/micronaut/http/client/MaxResponseSizeSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/MaxResponseSizeSpec.groovy index 7ad7a4f5ebc..c58084bcc2a 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/MaxResponseSizeSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/MaxResponseSizeSpec.groovy @@ -15,12 +15,6 @@ */ package io.micronaut.http.client -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.MediaType -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Get -import io.micronaut.http.client.exceptions.ContentLengthExceededException import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest import io.micronaut.http.MediaType diff --git a/http-client/src/test/groovy/io/micronaut/http/client/ReadTimeoutSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/ReadTimeoutSpec.groovy index 0d451212291..57d1a3b830a 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/ReadTimeoutSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/ReadTimeoutSpec.groovy @@ -15,12 +15,6 @@ */ package io.micronaut.http.client -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.MediaType -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Get -import io.micronaut.http.client.exceptions.ReadTimeoutException import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest import io.micronaut.http.MediaType diff --git a/http-client/src/test/groovy/io/micronaut/http/client/SslSelfSignedSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/SslSelfSignedSpec.groovy index aae19b6e1fd..5759650b579 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/SslSelfSignedSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/SslSelfSignedSpec.groovy @@ -15,11 +15,6 @@ */ package io.micronaut.http.client -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpResponse -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Get import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest @@ -28,7 +23,6 @@ import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Get import io.micronaut.runtime.server.EmbeddedServer import spock.lang.AutoCleanup -import spock.lang.Ignore import spock.lang.Shared import spock.lang.Specification diff --git a/http-client/src/test/groovy/io/micronaut/http/client/SslStaticCertSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/SslStaticCertSpec.groovy index f8c49ea7301..eadf268ad88 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/SslStaticCertSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/SslStaticCertSpec.groovy @@ -15,11 +15,6 @@ */ package io.micronaut.http.client -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpResponse -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Get import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest @@ -28,7 +23,6 @@ import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Get import io.micronaut.runtime.server.EmbeddedServer import spock.lang.AutoCleanup -import spock.lang.Ignore import spock.lang.Shared import spock.lang.Specification diff --git a/http-client/src/test/groovy/io/micronaut/http/client/StreamRequestSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/StreamRequestSpec.groovy index 1d51fe2a03c..528875b2cde 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/StreamRequestSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/StreamRequestSpec.groovy @@ -16,7 +16,6 @@ package io.micronaut.http.client import groovy.transform.EqualsAndHashCode -import groovy.transform.NotYetImplemented import io.micronaut.context.ApplicationContext import io.micronaut.core.type.Argument import io.micronaut.http.HttpRequest @@ -24,24 +23,19 @@ import io.micronaut.http.HttpResponse import io.micronaut.http.MediaType import io.micronaut.http.annotation.Body import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Get import io.micronaut.http.annotation.Header import io.micronaut.http.annotation.Post import io.micronaut.http.client.StreamRequestSpec.Book import io.micronaut.runtime.server.EmbeddedServer import io.reactivex.BackpressureStrategy -import io.reactivex.Emitter import io.reactivex.Flowable import io.reactivex.FlowableEmitter import io.reactivex.FlowableOnSubscribe import io.reactivex.Single import io.reactivex.annotations.NonNull -import io.reactivex.functions.Consumer import spock.lang.AutoCleanup import spock.lang.Shared import spock.lang.Specification - -import javax.print.attribute.standard.Media import java.nio.charset.StandardCharsets /** diff --git a/http-client/src/test/groovy/io/micronaut/http/client/aop/BlockingCrudSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/aop/BlockingCrudSpec.groovy index 991425c4f3f..4ead8e0064d 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/aop/BlockingCrudSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/aop/BlockingCrudSpec.groovy @@ -15,14 +15,8 @@ */ package io.micronaut.http.client.aop -import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpResponse import io.micronaut.http.HttpStatus -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Delete -import io.micronaut.http.annotation.Get -import io.micronaut.http.annotation.Patch -import io.micronaut.http.annotation.Post import io.micronaut.context.ApplicationContext import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Delete @@ -32,7 +26,6 @@ import io.micronaut.http.annotation.Post import io.micronaut.http.client.Client import io.micronaut.runtime.server.EmbeddedServer import spock.lang.AutoCleanup -import spock.lang.Ignore import spock.lang.Shared import spock.lang.Specification diff --git a/http-client/src/test/groovy/io/micronaut/http/client/aop/BlockingFallbackSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/aop/BlockingFallbackSpec.groovy index 9b0e3114124..d4edd8c009e 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/aop/BlockingFallbackSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/aop/BlockingFallbackSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.http.client.aop -import io.micronaut.context.ApplicationContext import io.micronaut.context.ApplicationContext import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Delete diff --git a/http-client/src/test/groovy/io/micronaut/http/client/aop/BlockingPojoCrudSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/aop/BlockingPojoCrudSpec.groovy index acde338502c..ae5b6a3e7af 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/aop/BlockingPojoCrudSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/aop/BlockingPojoCrudSpec.groovy @@ -15,13 +15,6 @@ */ package io.micronaut.http.client.aop -import io.micronaut.context.ApplicationContext -import io.micronaut.http.annotation.Body -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Delete -import io.micronaut.http.annotation.Get -import io.micronaut.http.annotation.Patch -import io.micronaut.http.annotation.Post import io.micronaut.context.ApplicationContext import io.micronaut.core.bind.BeanPropertyBinder import io.micronaut.http.annotation.Body diff --git a/http-client/src/test/groovy/io/micronaut/http/client/aop/CompletableFutureCrudSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/aop/CompletableFutureCrudSpec.groovy index 25289aa5af6..4e87c39bedf 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/aop/CompletableFutureCrudSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/aop/CompletableFutureCrudSpec.groovy @@ -15,12 +15,6 @@ */ package io.micronaut.http.client.aop -import io.micronaut.context.ApplicationContext -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Delete -import io.micronaut.http.annotation.Get -import io.micronaut.http.annotation.Patch -import io.micronaut.http.annotation.Post import io.micronaut.context.ApplicationContext import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Delete diff --git a/http-client/src/test/groovy/io/micronaut/http/client/aop/CompletableFutureFallbackSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/aop/CompletableFutureFallbackSpec.groovy index ef023f763fc..65d7b0d5456 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/aop/CompletableFutureFallbackSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/aop/CompletableFutureFallbackSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.http.client.aop -import io.micronaut.context.ApplicationContext import io.micronaut.context.ApplicationContext import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Delete diff --git a/http-client/src/test/groovy/io/micronaut/http/client/aop/HeadersSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/aop/HeadersSpec.groovy index db3de0fa109..29de5123444 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/aop/HeadersSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/aop/HeadersSpec.groovy @@ -23,7 +23,6 @@ import io.micronaut.http.annotation.Headers import io.micronaut.http.client.Client import io.micronaut.runtime.server.EmbeddedServer import spock.lang.AutoCleanup -import spock.lang.Ignore import spock.lang.Shared import spock.lang.Specification diff --git a/http-client/src/test/groovy/io/micronaut/http/client/aop/NullableCrudSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/aop/NullableCrudSpec.groovy index 9dad18a8350..7de5a8a9292 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/aop/NullableCrudSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/aop/NullableCrudSpec.groovy @@ -15,13 +15,6 @@ */ package io.micronaut.http.client.aop -import io.micronaut.context.ApplicationContext -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Delete -import io.micronaut.http.annotation.Get -import io.micronaut.http.annotation.Patch -import io.micronaut.http.annotation.Post -import io.micronaut.http.client.Client import io.micronaut.context.ApplicationContext import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Delete diff --git a/http-client/src/test/groovy/io/micronaut/http/client/aop/PlaceholdersInClientSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/aop/PlaceholdersInClientSpec.groovy index 987cd411be6..bb06393c899 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/aop/PlaceholdersInClientSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/aop/PlaceholdersInClientSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.http.client.aop -import io.micronaut.context.ApplicationContext -import io.micronaut.http.annotation.Get import io.micronaut.context.ApplicationContext import io.micronaut.http.annotation.Get import io.micronaut.http.client.Client diff --git a/http-client/src/test/groovy/io/micronaut/http/client/aop/PublisherCrudSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/aop/PublisherCrudSpec.groovy index 73d68ba907f..b0a9378bdbe 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/aop/PublisherCrudSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/aop/PublisherCrudSpec.groovy @@ -15,12 +15,6 @@ */ package io.micronaut.http.client.aop -import io.micronaut.context.ApplicationContext -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Delete -import io.micronaut.http.annotation.Get -import io.micronaut.http.annotation.Patch -import io.micronaut.http.annotation.Post import io.reactivex.Flowable import io.reactivex.Maybe import io.micronaut.context.ApplicationContext diff --git a/http-client/src/test/groovy/io/micronaut/http/client/aop/ReactorCrudSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/aop/ReactorCrudSpec.groovy index 5a308c6ee58..9f0645966fe 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/aop/ReactorCrudSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/aop/ReactorCrudSpec.groovy @@ -15,12 +15,6 @@ */ package io.micronaut.http.client.aop -import io.micronaut.context.ApplicationContext -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Delete -import io.micronaut.http.annotation.Get -import io.micronaut.http.annotation.Patch -import io.micronaut.http.annotation.Post import io.micronaut.context.ApplicationContext import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Delete diff --git a/http-client/src/test/groovy/io/micronaut/http/client/aop/ReactorFallbackSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/aop/ReactorFallbackSpec.groovy index ad727eff943..2b5808a99ff 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/aop/ReactorFallbackSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/aop/ReactorFallbackSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.http.client.aop -import io.micronaut.context.ApplicationContext import io.micronaut.context.ApplicationContext import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Delete diff --git a/http-client/src/test/groovy/io/micronaut/http/client/aop/RxJavaCrudSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/aop/RxJavaCrudSpec.groovy index a8ac40760b4..e1a85ee41a3 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/aop/RxJavaCrudSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/aop/RxJavaCrudSpec.groovy @@ -15,19 +15,11 @@ */ package io.micronaut.http.client.aop -import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpResponse import io.micronaut.http.HttpStatus -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Delete -import io.micronaut.http.annotation.Get -import io.micronaut.http.annotation.Patch -import io.micronaut.http.annotation.Post -import io.reactivex.Flowable import io.reactivex.Maybe import io.reactivex.Single import io.micronaut.context.ApplicationContext -import io.micronaut.core.async.publisher.Publishers import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Delete import io.micronaut.http.annotation.Get @@ -35,7 +27,6 @@ import io.micronaut.http.annotation.Patch import io.micronaut.http.annotation.Post import io.micronaut.http.client.Client import io.micronaut.runtime.server.EmbeddedServer -import org.reactivestreams.Publisher import spock.lang.AutoCleanup import spock.lang.Shared import spock.lang.Specification diff --git a/http-client/src/test/groovy/io/micronaut/http/client/aop/RxJavaFallbackSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/aop/RxJavaFallbackSpec.groovy index e5eaa10f026..0114f5e6518 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/aop/RxJavaFallbackSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/aop/RxJavaFallbackSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.http.client.aop -import io.micronaut.context.ApplicationContext import io.reactivex.Flowable import io.reactivex.Maybe import io.reactivex.Single diff --git a/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientRetrySpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientRetrySpec.groovy index 4ffdfa8a795..e9a7cabe82c 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientRetrySpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientRetrySpec.groovy @@ -15,11 +15,6 @@ */ package io.micronaut.http.client.retry -import io.micronaut.context.ApplicationContext -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Get -import io.micronaut.http.client.Client -import io.micronaut.http.client.exceptions.HttpClientResponseException import io.reactivex.Single import io.micronaut.context.ApplicationContext import io.micronaut.http.annotation.Controller diff --git a/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientRetryWithFallbackSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientRetryWithFallbackSpec.groovy index 7e59bbc6fc4..63dfb1fef67 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientRetryWithFallbackSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientRetryWithFallbackSpec.groovy @@ -15,13 +15,11 @@ */ package io.micronaut.http.client.retry -import io.micronaut.context.ApplicationContext import io.reactivex.Single import io.micronaut.context.ApplicationContext import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Get import io.micronaut.http.client.Client -import io.micronaut.http.client.exceptions.HttpClientResponseException import io.micronaut.retry.annotation.Fallback import io.micronaut.retry.annotation.Retryable import io.micronaut.runtime.server.EmbeddedServer diff --git a/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientWithCircuitBreakerSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientWithCircuitBreakerSpec.groovy index 8ea0058fcbe..1e17638655b 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientWithCircuitBreakerSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/retry/HttpClientWithCircuitBreakerSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.http.client.retry -import io.micronaut.context.ApplicationContext import io.reactivex.Single import io.micronaut.context.ApplicationContext import io.micronaut.http.annotation.Controller @@ -23,7 +22,6 @@ import io.micronaut.http.annotation.Get import io.micronaut.http.client.Client import io.micronaut.http.client.exceptions.HttpClientResponseException import io.micronaut.retry.annotation.CircuitBreaker -import io.micronaut.retry.annotation.Retryable import io.micronaut.runtime.server.EmbeddedServer import spock.lang.AutoCleanup import spock.lang.Shared diff --git a/http-client/src/test/groovy/io/micronaut/http/client/rxjava2/RxHttpPostSpec.groovy b/http-client/src/test/groovy/io/micronaut/http/client/rxjava2/RxHttpPostSpec.groovy index b7350342972..f6db0a75701 100644 --- a/http-client/src/test/groovy/io/micronaut/http/client/rxjava2/RxHttpPostSpec.groovy +++ b/http-client/src/test/groovy/io/micronaut/http/client/rxjava2/RxHttpPostSpec.groovy @@ -15,11 +15,6 @@ */ package io.micronaut.http.client.rxjava2 -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpResponse -import io.micronaut.http.HttpStatus -import io.micronaut.http.MediaType import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest diff --git a/http-server-netty/src/test/groovy/io/micronaut/health/HeartbeatTaskSpec.groovy b/http-server-netty/src/test/groovy/io/micronaut/health/HeartbeatTaskSpec.groovy index fbf95db1dc7..ba29458490f 100644 --- a/http-server-netty/src/test/groovy/io/micronaut/health/HeartbeatTaskSpec.groovy +++ b/http-server-netty/src/test/groovy/io/micronaut/health/HeartbeatTaskSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.health -import io.micronaut.context.ApplicationContext -import io.micronaut.context.event.ApplicationEventListener import io.micronaut.context.ApplicationContext import io.micronaut.context.event.ApplicationEventListener import io.micronaut.runtime.server.EmbeddedServer diff --git a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/AbstractMicronautSpec.groovy b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/AbstractMicronautSpec.groovy index a22e9bf130b..5c0425b6a45 100644 --- a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/AbstractMicronautSpec.groovy +++ b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/AbstractMicronautSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.http.server.netty -import io.micronaut.context.ApplicationContext import io.micronaut.context.ApplicationContext import io.micronaut.http.client.RxHttpClient import io.micronaut.runtime.server.EmbeddedServer diff --git a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/binding/NettyHttpResponseSpec.groovy b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/binding/NettyHttpResponseSpec.groovy index a69be8d28e8..05e3d1bc389 100644 --- a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/binding/NettyHttpResponseSpec.groovy +++ b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/binding/NettyHttpResponseSpec.groovy @@ -20,7 +20,6 @@ import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.codec.http.HttpVersion import io.micronaut.core.convert.DefaultConversionService import io.micronaut.http.HttpHeaders -import io.micronaut.http.HttpResponse import io.micronaut.http.HttpStatus import io.micronaut.http.MutableHttpResponse import io.micronaut.http.cookie.Cookie diff --git a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/configuration/NettyHttpServerConfigurationSpec.groovy b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/configuration/NettyHttpServerConfigurationSpec.groovy index f61dc827438..d4cf5029cb4 100644 --- a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/configuration/NettyHttpServerConfigurationSpec.groovy +++ b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/configuration/NettyHttpServerConfigurationSpec.groovy @@ -15,13 +15,9 @@ */ package io.micronaut.http.server.netty.configuration -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.PropertySource import io.netty.channel.ChannelOption import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.MapPropertySource import io.micronaut.context.env.PropertySource import io.micronaut.http.HttpMethod import io.micronaut.http.server.cors.CorsOriginConfiguration diff --git a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/cors/CorsFilterSpec.groovy b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/cors/CorsFilterSpec.groovy index b8c7250b0a9..c62ada8a778 100644 --- a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/cors/CorsFilterSpec.groovy +++ b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/cors/CorsFilterSpec.groovy @@ -15,12 +15,6 @@ */ package io.micronaut.http.server.netty.cors -import io.micronaut.http.HttpMethod -import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpStatus -import io.micronaut.http.MutableHttpResponse -import io.micronaut.http.server.cors.CorsFilter -import io.micronaut.http.server.cors.CorsOriginConfiguration import io.micronaut.core.type.Argument import io.micronaut.http.HttpHeaders import io.micronaut.http.HttpMethod diff --git a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/redirect/RedirectSpec.groovy b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/redirect/RedirectSpec.groovy index fee8efe6409..13d5d8938b2 100644 --- a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/redirect/RedirectSpec.groovy +++ b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/redirect/RedirectSpec.groovy @@ -15,14 +15,7 @@ */ package io.micronaut.http.server.netty.redirect -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpHeaders -import io.micronaut.http.HttpResponse -import io.micronaut.http.HttpStatus -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Get import io.micronaut.http.client.DefaultHttpClientConfiguration -import io.micronaut.http.client.RxHttpClient import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpHeaders import io.micronaut.http.HttpResponse diff --git a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/stream/JsonStreamSpec.groovy b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/stream/JsonStreamSpec.groovy index 23da7823c36..c854e360b7f 100644 --- a/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/stream/JsonStreamSpec.groovy +++ b/http-server-netty/src/test/groovy/io/micronaut/http/server/netty/stream/JsonStreamSpec.groovy @@ -15,13 +15,6 @@ */ package io.micronaut.http.server.netty.stream -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpResponse -import io.micronaut.http.MediaType -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Get -import io.micronaut.http.client.RxStreamingHttpClient import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest diff --git a/http/src/test/groovy/io/micronaut/http/uri/UriTemplateSpec.groovy b/http/src/test/groovy/io/micronaut/http/uri/UriTemplateSpec.groovy index 4b921d10eb7..346ca67915c 100644 --- a/http/src/test/groovy/io/micronaut/http/uri/UriTemplateSpec.groovy +++ b/http/src/test/groovy/io/micronaut/http/uri/UriTemplateSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.http.uri -import io.micronaut.http.uri.UriTemplate import spock.lang.Specification import spock.lang.Unroll diff --git a/inject-groovy/src/test/groovy/io/micronaut/AbstractBeanDefinitionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/AbstractBeanDefinitionSpec.groovy index 1f853bf7b95..93863c5aa8a 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/AbstractBeanDefinitionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/AbstractBeanDefinitionSpec.groovy @@ -16,18 +16,10 @@ package io.micronaut import groovy.transform.CompileStatic -import io.micronaut.ast.groovy.annotation.GroovyAnnotationMetadataBuilder -import io.micronaut.ast.groovy.utils.InMemoryByteCodeGroovyClassLoader -import io.micronaut.core.annotation.AnnotationMetadata -import io.micronaut.core.naming.NameUtils -import io.micronaut.inject.BeanDefinition -import io.micronaut.inject.annotation.AnnotationMetadataWriter import org.codehaus.groovy.ast.ASTNode import org.codehaus.groovy.ast.ClassNode import org.codehaus.groovy.ast.MethodNode import org.codehaus.groovy.ast.builder.AstBuilder -import org.codehaus.groovy.control.CompilerConfiguration -import io.micronaut.ast.groovy.InjectTransform import io.micronaut.ast.groovy.annotation.GroovyAnnotationMetadataBuilder import io.micronaut.ast.groovy.utils.InMemoryByteCodeGroovyClassLoader import io.micronaut.core.annotation.AnnotationMetadata diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnConcreteClassFactorySpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnConcreteClassFactorySpec.groovy index 949a91e820d..3e5f983b7d3 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnConcreteClassFactorySpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnConcreteClassFactorySpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.aop.factory -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.qualifiers.Qualifiers import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnInterfaceFactorySpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnInterfaceFactorySpec.groovy index 4d4dee4cb00..e79e626f8d7 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnInterfaceFactorySpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnInterfaceFactorySpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.aop.factory -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.BeanDefinition -import io.micronaut.inject.qualifiers.Qualifiers import org.hibernate.SessionFactory import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/hotswap/ProxyHotswapSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/hotswap/ProxyHotswapSpec.groovy index 77ac7897b4c..d8eb260ef3e 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/hotswap/ProxyHotswapSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/hotswap/ProxyHotswapSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.aop.hotswap -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.aop.HotSwappableInterceptedProxy import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/introduction/AbstractClassIntroductionAdviceSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/introduction/AbstractClassIntroductionAdviceSpec.groovy index 798561d5bd5..095d18506c5 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/introduction/AbstractClassIntroductionAdviceSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/introduction/AbstractClassIntroductionAdviceSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.aop.introduction -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/introduction/InterfaceIntroductionAdviceSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/introduction/InterfaceIntroductionAdviceSpec.groovy index 7eff4de7700..b4573bbec50 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/introduction/InterfaceIntroductionAdviceSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/introduction/InterfaceIntroductionAdviceSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.aop.introduction -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/itfce/InterfaceMethodLevelAopSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/itfce/InterfaceMethodLevelAopSpec.groovy index 0d52cec9459..15d7cb9815c 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/itfce/InterfaceMethodLevelAopSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/itfce/InterfaceMethodLevelAopSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.aop.itfce -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.BeanDefinition import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/itfce/InterfaceTypeLevelSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/itfce/InterfaceTypeLevelSpec.groovy index 9d016cd01bb..352b89dd707 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/itfce/InterfaceTypeLevelSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/itfce/InterfaceTypeLevelSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.aop.itfce -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.BeanDefinition import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/lazy/LazyBeanResolveProxySpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/lazy/LazyBeanResolveProxySpec.groovy index 0361d553a8c..cde3597809a 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/lazy/LazyBeanResolveProxySpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/lazy/LazyBeanResolveProxySpec.groovy @@ -15,13 +15,9 @@ */ package io.micronaut.aop.lazy -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.aop.Intercepted -import io.micronaut.aop.factory.ConcreteClass import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.qualifiers.Qualifiers import spock.lang.Specification import spock.lang.Unroll diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/proxytarget/ProxyingMethodLevelAopSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/proxytarget/ProxyingMethodLevelAopSpec.groovy index 4165b5bc570..bd21ca46bea 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/proxytarget/ProxyingMethodLevelAopSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/proxytarget/ProxyingMethodLevelAopSpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.aop.proxytarget -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.BeanDefinition -import io.micronaut.aop.Intercepted import io.micronaut.aop.InterceptedProxy import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/simple/SimpleGroovyClassMethodLevelAopSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/simple/SimpleGroovyClassMethodLevelAopSpec.groovy index ddb7c557e0c..86cb1a25e3e 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/simple/SimpleGroovyClassMethodLevelAopSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/simple/SimpleGroovyClassMethodLevelAopSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.aop.simple -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.BeanDefinition import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-groovy/src/test/groovy/io/micronaut/aop/simple/SimpleGroovyClassTypeLevelAopSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/aop/simple/SimpleGroovyClassTypeLevelAopSpec.groovy index 2c9e342106b..0bd60da9893 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/aop/simple/SimpleGroovyClassTypeLevelAopSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/aop/simple/SimpleGroovyClassTypeLevelAopSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.aop.simple -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilderSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilderSpec.groovy index c42e50f7380..039ab34d9c8 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilderSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilderSpec.groovy @@ -16,11 +16,6 @@ package io.micronaut.ast.groovy.annotation import io.micronaut.context.annotation.Context -import io.micronaut.context.annotation.Infrastructure -import io.micronaut.context.annotation.Primary -import io.micronaut.context.annotation.Requirements -import io.micronaut.context.annotation.Requires -import io.micronaut.inject.annotation.AnnotationValue import org.codehaus.groovy.ast.ASTNode import org.codehaus.groovy.ast.ClassNode import org.codehaus.groovy.ast.MethodNode diff --git a/inject-groovy/src/test/groovy/io/micronaut/docs/client/ThirdPartyClientFilterSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/docs/client/ThirdPartyClientFilterSpec.groovy index e4b1579fcac..809936313e6 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/docs/client/ThirdPartyClientFilterSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/docs/client/ThirdPartyClientFilterSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.docs.client -import io.micronaut.context.ApplicationContext -import io.micronaut.context.annotation.Value import io.reactivex.Flowable import io.reactivex.functions.Consumer diff --git a/inject-groovy/src/test/groovy/io/micronaut/docs/config/builder/VehicleSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/docs/config/builder/VehicleSpec.groovy index 7b08d704b11..f7eaad88679 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/docs/config/builder/VehicleSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/docs/config/builder/VehicleSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.docs.config.builder -import io.micronaut.context.ApplicationContext import io.micronaut.context.ApplicationContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/docs/config/properties/VehicleSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/docs/config/properties/VehicleSpec.groovy index 4bd86b0933b..42f0ab1a671 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/docs/config/properties/VehicleSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/docs/config/properties/VehicleSpec.groovy @@ -16,10 +16,6 @@ package io.micronaut.docs.config.properties import io.micronaut.context.ApplicationContext -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.env.MapPropertySource import spock.lang.Specification /** diff --git a/inject-groovy/src/test/groovy/io/micronaut/docs/config/value/VehicleSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/docs/config/value/VehicleSpec.groovy index ced5af6a8ff..f38f260b753 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/docs/config/value/VehicleSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/docs/config/value/VehicleSpec.groovy @@ -18,11 +18,6 @@ package io.micronaut.docs.config.value import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext import io.micronaut.context.env.PropertySource -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.env.MapPropertySource -import io.micronaut.context.env.PropertySource import spock.lang.Specification /** diff --git a/inject-groovy/src/test/groovy/io/micronaut/docs/events/factory/VehicleSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/docs/events/factory/VehicleSpec.groovy index b278851fbf5..89ad683edc0 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/docs/events/factory/VehicleSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/docs/events/factory/VehicleSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.docs.events.factory -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/docs/factories/VehicleSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/docs/factories/VehicleSpec.groovy index 312a533bbfe..f29c8bc3fa5 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/docs/factories/VehicleSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/docs/factories/VehicleSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.docs.factories -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/docs/intro/VehicleSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/docs/intro/VehicleSpec.groovy index 96de50b509e..91ca90bcfd8 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/docs/intro/VehicleSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/docs/intro/VehicleSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.docs.intro -import io.micronaut.context.BeanContext -import io.micronaut.context.* import spock.lang.Specification /** diff --git a/inject-groovy/src/test/groovy/io/micronaut/docs/lifecycle/VehicleSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/docs/lifecycle/VehicleSpec.groovy index 1d495abc498..f9992d99bf2 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/docs/lifecycle/VehicleSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/docs/lifecycle/VehicleSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.docs.lifecycle -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/docs/qualifiers/annotation/VehicleSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/docs/qualifiers/annotation/VehicleSpec.groovy index a2d6c569a8d..c394ac27dfe 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/docs/qualifiers/annotation/VehicleSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/docs/qualifiers/annotation/VehicleSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.docs.qualifiers.annotation -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/docs/qualifiers/named/VehicleSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/docs/qualifiers/named/VehicleSpec.groovy index fac1e6b0be2..56e7f378728 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/docs/qualifiers/named/VehicleSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/docs/qualifiers/named/VehicleSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.docs.qualifiers.named -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/docs/scopes/RefreshEventSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/docs/scopes/RefreshEventSpec.groovy index 7e355d199f7..4e894885279 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/docs/scopes/RefreshEventSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/docs/scopes/RefreshEventSpec.groovy @@ -17,7 +17,6 @@ package io.micronaut.docs.scopes import groovy.json.JsonOutput import io.micronaut.context.ApplicationContext -import io.micronaut.context.ApplicationContext import io.micronaut.core.io.socket.SocketUtils import io.micronaut.http.HttpResponse import io.micronaut.http.annotation.Controller @@ -28,7 +27,6 @@ import io.micronaut.runtime.context.scope.refresh.RefreshEvent import io.micronaut.runtime.server.EmbeddedServer import spock.lang.AutoCleanup import spock.lang.Ignore -import spock.lang.IgnoreIf import spock.lang.Shared import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/concurrency/ConcurrentSingleAccessSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/concurrency/ConcurrentSingleAccessSpec.groovy index 1d085658489..408a8cc0d29 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/concurrency/ConcurrentSingleAccessSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/concurrency/ConcurrentSingleAccessSpec.groovy @@ -15,15 +15,12 @@ */ package io.micronaut.inject.concurrency -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification import javax.inject.Singleton import java.util.concurrent.ConcurrentLinkedQueue -import java.util.concurrent.ConcurrentSkipListSet /** * Created by graemerocher on 17/05/2017. diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesInheritanceSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesInheritanceSpec.groovy index c3e7824c41c..784ef189bfa 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesInheritanceSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesInheritanceSpec.groovy @@ -15,12 +15,9 @@ */ package io.micronaut.inject.configproperties -import io.micronaut.context.annotation.ConfigurationProperties -import io.micronaut.context.env.PropertySource import io.micronaut.context.annotation.ConfigurationProperties import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.MapPropertySource import io.micronaut.context.env.PropertySource import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesSpec.groovy index 71a6371b0fb..1bb6b717ab2 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesSpec.groovy @@ -15,10 +15,8 @@ */ package io.micronaut.inject.configproperties -import io.micronaut.context.env.PropertySource import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.MapPropertySource import io.micronaut.context.env.PropertySource import spock.lang.Specification /** diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/PrimitiveConfigurationPropertiesSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/PrimitiveConfigurationPropertiesSpec.groovy index 8d05b9fe495..fd6f992c1b6 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/PrimitiveConfigurationPropertiesSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/PrimitiveConfigurationPropertiesSpec.groovy @@ -15,12 +15,9 @@ */ package io.micronaut.inject.configproperties -import io.micronaut.context.annotation.ConfigurationProperties -import io.micronaut.context.env.PropertySource import io.micronaut.context.annotation.ConfigurationProperties import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.MapPropertySource import io.micronaut.context.env.PropertySource import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy index 0256765125c..e64c0ae0bfd 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy @@ -15,13 +15,9 @@ */ package io.micronaut.inject.configproperties -import io.micronaut.context.annotation.ConfigurationProperties -import io.micronaut.context.env.PropertySource -import io.micronaut.context.exceptions.BeanInstantiationException import io.micronaut.context.annotation.ConfigurationProperties import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.MapPropertySource import io.micronaut.context.env.PropertySource import io.micronaut.context.exceptions.BeanInstantiationException import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/configurations/RequiresBeanSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/configurations/RequiresBeanSpec.groovy index 3759b1fca2b..121996fbaa5 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/configurations/RequiresBeanSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/configurations/RequiresBeanSpec.groovy @@ -26,21 +26,6 @@ import io.micronaut.inject.configurations.requiresconditiontrue.TrueBean import io.micronaut.inject.configurations.requiresconfig.RequiresConfig import io.micronaut.inject.configurations.requiresproperty.RequiresProperty import io.micronaut.inject.configurations.requiressdk.RequiresJava9 -import io.micronaut.context.ApplicationContext -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.env.MapPropertySource -import io.micronaut.context.env.PropertySource -import io.micronaut.inject.configurations.requiresbean.RequiresBean -import io.micronaut.inject.configurations.requirescondition.TravisBean -import io.micronaut.inject.configurations.requirescondition2.TrueLambdaBean -import io.micronaut.inject.configurations.requiresconditionfalse.TravisBean2 -import io.micronaut.inject.configurations.requiresconditiontrue.TrueBean -import io.micronaut.inject.configurations.requiresconfig.RequiresConfig -import io.micronaut.inject.configurations.requiresproperty.RequiresProperty -import io.micronaut.inject.configurations.requiressdk.RequiresJava9 -import spock.lang.Ignore import spock.lang.Specification /** * Created by graemerocher on 19/05/2017. diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorArrayInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorArrayInjectionSpec.groovy index 8666f7ec2de..71b6667578d 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorArrayInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorArrayInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorCollectionInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorCollectionInjectionSpec.groovy index 12220adfb68..37d679efa72 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorCollectionInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorCollectionInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorFactorySpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorFactorySpec.groovy index 7783072eaeb..b3a3cfaf169 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorFactorySpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorFactorySpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.constructor -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.annotation.Provided import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.annotation.Provided diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorMultipleInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorMultipleInjectionSpec.groovy index 18f2abaf6a8..7668f53bff2 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorMultipleInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorMultipleInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorNullableSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorNullableSpec.groovy index 3cb2f0506a8..0e21136eb61 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorNullableSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorNullableSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.constructor -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.exceptions.DependencyInjectionException import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.DependencyInjectionException diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorOptionalSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorOptionalSpec.groovy index 9c9921f046d..431d90e6b2c 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorOptionalSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorOptionalSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorSimpleInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorSimpleInjectionSpec.groovy index edc32b8759e..a36fcec2318 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorSimpleInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorSimpleInjectionSpec.groovy @@ -18,8 +18,6 @@ package io.micronaut.inject.constructor import groovy.transform.PackageScope import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import spock.lang.Specification import javax.inject.Inject diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorStreamSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorStreamSpec.groovy index dbd6d591348..a9546c91201 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorStreamSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorStreamSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorWithInterfaceSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorWithInterfaceSpec.groovy index d769f302911..97e983bfa5a 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorWithInterfaceSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorWithInterfaceSpec.groovy @@ -17,13 +17,9 @@ package io.micronaut.inject.constructor import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.annotation.Provided import spock.lang.Specification import javax.inject.Inject -import javax.inject.Provider import javax.inject.Singleton /** diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorWithProviderSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorWithProviderSpec.groovy index 77f783531bd..1046a0ae6e2 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorWithProviderSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/constructor/ConstructorWithProviderSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/context/RegisterSingletonSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/context/RegisterSingletonSpec.groovy index 82b980604bb..b8a578f600b 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/context/RegisterSingletonSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/context/RegisterSingletonSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.context -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/env/EnvironmentInjectSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/env/EnvironmentInjectSpec.groovy index 28ea334fbf2..c771ee71a84 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/env/EnvironmentInjectSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/env/EnvironmentInjectSpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.inject.env -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.DefaultEnvironment -import io.micronaut.context.env.Environment import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext import io.micronaut.context.env.DefaultEnvironment diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/executable/ExecutableSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/executable/ExecutableSpec.groovy index 927c2da9f62..9929bc93278 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/executable/ExecutableSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/executable/ExecutableSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.executable -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.annotation.Executable import io.micronaut.context.AbstractExecutableMethod import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/factory/BeanInitializingWithFactorySpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/factory/BeanInitializingWithFactorySpec.groovy index 059fa70c5ea..efb66c697c5 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/factory/BeanInitializingWithFactorySpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/factory/BeanInitializingWithFactorySpec.groovy @@ -15,12 +15,6 @@ */ package io.micronaut.inject.factory -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.annotation.Bean -import io.micronaut.context.annotation.Factory -import io.micronaut.context.event.BeanInitializedEventListener -import io.micronaut.context.event.BeanInitializingEvent import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.annotation.Bean @@ -31,7 +25,6 @@ import spock.lang.Specification import javax.annotation.PostConstruct import javax.inject.Inject -import javax.inject.Provider import javax.inject.Singleton /** diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/factory/FactorySpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/factory/FactorySpec.groovy index 09c14de75d8..7764aef1719 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/factory/FactorySpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/factory/FactorySpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.inject.factory -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.annotation.Bean -import io.micronaut.context.annotation.Factory import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.annotation.Bean diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/factory/PrototypeAnnotationSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/factory/PrototypeAnnotationSpec.groovy index 0074c82f399..f14a9cb9334 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/factory/PrototypeAnnotationSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/factory/PrototypeAnnotationSpec.groovy @@ -18,10 +18,6 @@ package io.micronaut.inject.factory import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.annotation.Prototype -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.annotation.Bean -import io.micronaut.context.annotation.Prototype import spock.lang.Specification /** diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/ConstructorCircularDependencyFailureSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/ConstructorCircularDependencyFailureSpec.groovy index 9a66df03cde..f09eaf4806d 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/ConstructorCircularDependencyFailureSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/ConstructorCircularDependencyFailureSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.failures -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.exceptions.CircularDependencyException import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.CircularDependencyException diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/ConstructorDependencyFailureSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/ConstructorDependencyFailureSpec.groovy index cbbf4c2308a..a8b41392226 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/ConstructorDependencyFailureSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/ConstructorDependencyFailureSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.failures -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.exceptions.DependencyInjectionException import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.DependencyInjectionException diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/ConstructorExceptionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/ConstructorExceptionSpec.groovy index 7ab08a93a3f..22bc5b3b40c 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/ConstructorExceptionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/ConstructorExceptionSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.failures -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.exceptions.DependencyInjectionException import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.DependencyInjectionException diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/FieldCircularDependencyFailureSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/FieldCircularDependencyFailureSpec.groovy index 499fd02627e..ece0cb19245 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/FieldCircularDependencyFailureSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/FieldCircularDependencyFailureSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.failures -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.exceptions.CircularDependencyException import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.CircularDependencyException diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/FieldDependencyMissingFailureSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/FieldDependencyMissingFailureSpec.groovy index ddcb089757b..d7212521217 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/FieldDependencyMissingFailureSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/FieldDependencyMissingFailureSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.failures -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.exceptions.DependencyInjectionException import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.DependencyInjectionException diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/NestedDependencyFailureSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/NestedDependencyFailureSpec.groovy index 97fb22d1e54..7f216a37ec7 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/NestedDependencyFailureSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/NestedDependencyFailureSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.failures -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.exceptions.DependencyInjectionException import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.DependencyInjectionException diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/PostConstructExceptionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/PostConstructExceptionSpec.groovy index ee67d5981c3..d681f5ec6fb 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/PostConstructExceptionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/PostConstructExceptionSpec.groovy @@ -18,10 +18,6 @@ package io.micronaut.inject.failures import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.BeanInstantiationException -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.exceptions.BeanInstantiationException -import io.micronaut.context.exceptions.DependencyInjectionException import spock.lang.Specification import javax.annotation.PostConstruct diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/PropertyCircularDependencyFailureSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/PropertyCircularDependencyFailureSpec.groovy index cfe7097580d..9b67ff5f2a1 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/PropertyCircularDependencyFailureSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/PropertyCircularDependencyFailureSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.failures -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.exceptions.CircularDependencyException import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.CircularDependencyException diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/PropertyExceptionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/PropertyExceptionSpec.groovy index f45fa857afd..b92c8c66b69 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/failures/PropertyExceptionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/failures/PropertyExceptionSpec.groovy @@ -18,10 +18,6 @@ package io.micronaut.inject.failures import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.BeanInstantiationException -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.exceptions.BeanInstantiationException -import io.micronaut.context.exceptions.DependencyInjectionException import spock.lang.Specification import javax.inject.Inject diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldArrayFactorySpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldArrayFactorySpec.groovy index d58f519c14f..d947d62f3e6 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldArrayFactorySpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldArrayFactorySpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldArrayInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldArrayInjectionSpec.groovy index 50a9573a97f..cfb83dc5c68 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldArrayInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldArrayInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldFactorySpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldFactorySpec.groovy index af8756583d9..28719677e28 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldFactorySpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldFactorySpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldInjectionSpec.groovy index a8de433d0e8..e6adb8de514 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldListInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldListInjectionSpec.groovy index a28c30bb667..60777aac7f4 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldListInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldListInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldOptionalSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldOptionalSpec.groovy index 046d5962939..c66da647e4d 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldOptionalSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldOptionalSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldPrivateWithQualifierSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldPrivateWithQualifierSpec.groovy index 9cffa37dd5a..d42e5b2560b 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldPrivateWithQualifierSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldPrivateWithQualifierSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.field -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.qualifiers.One import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.inject.qualifiers.One diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldProtectedWithQualifierSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldProtectedWithQualifierSpec.groovy index 7102f1cba6a..558d87d8436 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldProtectedWithQualifierSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldProtectedWithQualifierSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.field -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.qualifiers.One import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.inject.qualifiers.One diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldSetInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldSetInjectionSpec.groovy index 352f278a30b..3fcb8df9a24 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldSetInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldSetInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldStreamInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldStreamInjectionSpec.groovy index c583a4e8d7e..3438b377237 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldStreamInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/field/FieldStreamInjectionSpec.groovy @@ -18,8 +18,6 @@ package io.micronaut.inject.field import groovy.transform.PackageScope import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import spock.lang.Specification import javax.inject.Inject diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/generics/InjectWithWildcardSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/generics/InjectWithWildcardSpec.groovy index 90adf587e02..8247dfe57f0 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/generics/InjectWithWildcardSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/generics/InjectWithWildcardSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.generics -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext import io.micronaut.core.convert.ConversionService diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/inheritance/AbstractInheritanceSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/inheritance/AbstractInheritanceSpec.groovy index 6a4957f9e55..f9781a8893f 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/inheritance/AbstractInheritanceSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/inheritance/AbstractInheritanceSpec.groovy @@ -18,8 +18,6 @@ package io.micronaut.inject.inheritance import groovy.transform.PackageScope import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import spock.lang.Specification import javax.inject.Inject diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanCreationEventListenerSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanCreationEventListenerSpec.groovy index 36cf3118657..a5c361c9671 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanCreationEventListenerSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanCreationEventListenerSpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.inject.lifecyle -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.event.BeanCreatedEvent -import io.micronaut.context.event.BeanCreatedEventListener import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.event.BeanCreatedEvent diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanInitializingEventListenerSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanInitializingEventListenerSpec.groovy index 501b8822fb0..87d06c47019 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanInitializingEventListenerSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanInitializingEventListenerSpec.groovy @@ -19,12 +19,6 @@ import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.event.BeanInitializedEventListener import io.micronaut.context.event.BeanInitializingEvent -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.event.BeanCreatedEvent -import io.micronaut.context.event.BeanCreatedEventListener -import io.micronaut.context.event.BeanInitializedEventListener -import io.micronaut.context.event.BeanInitializingEvent import spock.lang.Specification import javax.annotation.PostConstruct diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanWithPostConstructSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanWithPostConstructSpec.groovy index 5df2e4de582..d80e4512fbb 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanWithPostConstructSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanWithPostConstructSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.lifecyle -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanWithPreDestroySpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanWithPreDestroySpec.groovy index 6685d0864da..a931bc1503d 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanWithPreDestroySpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/lifecyle/BeanWithPreDestroySpec.groovy @@ -15,13 +15,9 @@ */ package io.micronaut.inject.lifecyle -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification - -import javax.annotation.PostConstruct import javax.annotation.PreDestroy import javax.inject.Inject import javax.inject.Singleton diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterArrayInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterArrayInjectionSpec.groovy index e962d68e2a5..5c93d915ec5 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterArrayInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterArrayInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.method -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterInjectionSpec.groovy index aec1574ba2f..2483a4408d5 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.method -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterSetInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterSetInjectionSpec.groovy index 0fd2f8326a5..925c5444735 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterSetInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterSetInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.method -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterStreamSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterStreamSpec.groovy index 91f1a0a39c1..8ff41e92528 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterStreamSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterStreamSpec.groovy @@ -18,8 +18,6 @@ package io.micronaut.inject.method import groovy.transform.PackageScope import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import spock.lang.Specification import javax.inject.Inject diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterWithNullableSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterWithNullableSpec.groovy index 02d054ec721..fe698d2b038 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterWithNullableSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterWithNullableSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.method -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.exceptions.DependencyInjectionException import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.DependencyInjectionException @@ -25,7 +22,6 @@ import spock.lang.Specification import javax.annotation.Nullable import javax.inject.Inject -import javax.inject.Singleton /** * Created by graemerocher on 30/05/2017. diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterWithOptionalSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterWithOptionalSpec.groovy index bf5f4b23112..0de92b73d9f 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterWithOptionalSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterWithOptionalSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.method -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterWithQualifierSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterWithQualifierSpec.groovy index e105d2bd905..8a1cf941e0e 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterWithQualifierSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/method/SetterWithQualifierSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.method -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.qualifiers.One import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.inject.qualifiers.One diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyArrayInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyArrayInjectionSpec.groovy index 11c7bb713ee..3effdeaa7ea 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyArrayInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyArrayInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.property -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyInjectSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyInjectSpec.groovy index 2deb59d48be..f0134532d6b 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyInjectSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyInjectSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.property -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertySetInjectionSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertySetInjectionSpec.groovy index 2b030cac6af..5f50775c3bf 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertySetInjectionSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertySetInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.property -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyStreamSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyStreamSpec.groovy index 2c763b16019..1bb272f2b9b 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyStreamSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/property/PropertyStreamSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.property -import groovy.transform.PackageScope -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/qualifiers/ByTypeSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/qualifiers/ByTypeSpec.groovy index c56735783fa..a2d2c4c7ccc 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/qualifiers/ByTypeSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/qualifiers/ByTypeSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.qualifiers -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.annotation.Type import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.annotation.Type diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/qualifiers/PrimarySpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/qualifiers/PrimarySpec.groovy index 066fdd1f09c..72298774824 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/qualifiers/PrimarySpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/qualifiers/PrimarySpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.qualifiers -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.annotation.Primary import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.annotation.Primary diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/qualifiers/ReplacesSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/qualifiers/ReplacesSpec.groovy index 15c2fe22c88..6e3724e4d3f 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/qualifiers/ReplacesSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/qualifiers/ReplacesSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.qualifiers -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.annotation.Replaces import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.annotation.Replaces diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/scope/ContextScopeSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/scope/ContextScopeSpec.groovy index 368a844af69..a0d8ae83605 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/scope/ContextScopeSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/scope/ContextScopeSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.scope -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.annotation.Context import io.micronaut.context.DefaultBeanContext import io.micronaut.context.annotation.Context import spock.lang.Specification diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/value/FactoryWithValueSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/value/FactoryWithValueSpec.groovy index 47ae513e0fe..eb2e80a9d01 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/value/FactoryWithValueSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/value/FactoryWithValueSpec.groovy @@ -19,11 +19,6 @@ import io.micronaut.context.ApplicationContext import io.micronaut.context.annotation.Bean import io.micronaut.context.annotation.Factory import io.micronaut.context.annotation.Value -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.annotation.Bean -import io.micronaut.context.annotation.Factory -import io.micronaut.context.annotation.Value import spock.lang.Specification /** diff --git a/inject-groovy/src/test/groovy/io/micronaut/inject/value/ValueSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/inject/value/ValueSpec.groovy index e2da9f5eaaf..cbabebfc878 100644 --- a/inject-groovy/src/test/groovy/io/micronaut/inject/value/ValueSpec.groovy +++ b/inject-groovy/src/test/groovy/io/micronaut/inject/value/ValueSpec.groovy @@ -17,9 +17,6 @@ package io.micronaut.inject.value import io.micronaut.context.ApplicationContext import io.micronaut.context.annotation.Value -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.annotation.Value import spock.lang.Specification import javax.inject.Inject diff --git a/inject-java/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnConcreteClassFactorySpec.groovy b/inject-java/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnConcreteClassFactorySpec.groovy index 949a91e820d..3e5f983b7d3 100644 --- a/inject-java/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnConcreteClassFactorySpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnConcreteClassFactorySpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.aop.factory -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.qualifiers.Qualifiers import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-java/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnInterfaceFactorySpec.groovy b/inject-java/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnInterfaceFactorySpec.groovy index 4d4dee4cb00..e79e626f8d7 100644 --- a/inject-java/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnInterfaceFactorySpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/aop/factory/AdviceDefinedOnInterfaceFactorySpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.aop.factory -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.BeanDefinition -import io.micronaut.inject.qualifiers.Qualifiers import org.hibernate.SessionFactory import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext diff --git a/inject-java/src/test/groovy/io/micronaut/aop/hotswap/ProxyHotswapSpec.groovy b/inject-java/src/test/groovy/io/micronaut/aop/hotswap/ProxyHotswapSpec.groovy index 77ac7897b4c..d8eb260ef3e 100644 --- a/inject-java/src/test/groovy/io/micronaut/aop/hotswap/ProxyHotswapSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/aop/hotswap/ProxyHotswapSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.aop.hotswap -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.aop.HotSwappableInterceptedProxy import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-java/src/test/groovy/io/micronaut/aop/introduction/AbstractClassIntroductionAdviceSpec.groovy b/inject-java/src/test/groovy/io/micronaut/aop/introduction/AbstractClassIntroductionAdviceSpec.groovy index 798561d5bd5..095d18506c5 100644 --- a/inject-java/src/test/groovy/io/micronaut/aop/introduction/AbstractClassIntroductionAdviceSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/aop/introduction/AbstractClassIntroductionAdviceSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.aop.introduction -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-java/src/test/groovy/io/micronaut/aop/introduction/InterfaceIntroductionAdviceSpec.groovy b/inject-java/src/test/groovy/io/micronaut/aop/introduction/InterfaceIntroductionAdviceSpec.groovy index 7eff4de7700..b4573bbec50 100644 --- a/inject-java/src/test/groovy/io/micronaut/aop/introduction/InterfaceIntroductionAdviceSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/aop/introduction/InterfaceIntroductionAdviceSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.aop.introduction -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-java/src/test/groovy/io/micronaut/aop/itfce/InterfaceMethodLevelAopSpec.groovy b/inject-java/src/test/groovy/io/micronaut/aop/itfce/InterfaceMethodLevelAopSpec.groovy index 0d52cec9459..15d7cb9815c 100644 --- a/inject-java/src/test/groovy/io/micronaut/aop/itfce/InterfaceMethodLevelAopSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/aop/itfce/InterfaceMethodLevelAopSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.aop.itfce -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.BeanDefinition import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-java/src/test/groovy/io/micronaut/aop/itfce/InterfaceTypeLevelSpec.groovy b/inject-java/src/test/groovy/io/micronaut/aop/itfce/InterfaceTypeLevelSpec.groovy index 94db9371f85..28c8f47b76f 100644 --- a/inject-java/src/test/groovy/io/micronaut/aop/itfce/InterfaceTypeLevelSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/aop/itfce/InterfaceTypeLevelSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.aop.itfce -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.BeanDefinition import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-java/src/test/groovy/io/micronaut/aop/proxytarget/ProxyingMethodLevelAopSpec.groovy b/inject-java/src/test/groovy/io/micronaut/aop/proxytarget/ProxyingMethodLevelAopSpec.groovy index 4165b5bc570..bd21ca46bea 100644 --- a/inject-java/src/test/groovy/io/micronaut/aop/proxytarget/ProxyingMethodLevelAopSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/aop/proxytarget/ProxyingMethodLevelAopSpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.aop.proxytarget -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.BeanDefinition -import io.micronaut.aop.Intercepted import io.micronaut.aop.InterceptedProxy import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-java/src/test/groovy/io/micronaut/aop/simple/SimpleClassMethodLevelAopSpec.groovy b/inject-java/src/test/groovy/io/micronaut/aop/simple/SimpleClassMethodLevelAopSpec.groovy index 526f3a6766a..c060839562f 100644 --- a/inject-java/src/test/groovy/io/micronaut/aop/simple/SimpleClassMethodLevelAopSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/aop/simple/SimpleClassMethodLevelAopSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.aop.simple -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.BeanDefinition import io.micronaut.aop.Intercepted import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext diff --git a/inject-java/src/test/groovy/io/micronaut/aop/simple/SimpleClassTypeLevelAopSpec.groovy b/inject-java/src/test/groovy/io/micronaut/aop/simple/SimpleClassTypeLevelAopSpec.groovy index 1bfb1c8f597..810e128e69c 100644 --- a/inject-java/src/test/groovy/io/micronaut/aop/simple/SimpleClassTypeLevelAopSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/aop/simple/SimpleClassTypeLevelAopSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.aop.simple -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/AbstractTypeElementSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/AbstractTypeElementSpec.groovy index 0c59fd5f4b5..53144cbd7c5 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/AbstractTypeElementSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/AbstractTypeElementSpec.groovy @@ -17,13 +17,8 @@ package io.micronaut.inject import com.sun.tools.javac.model.JavacElements import com.sun.tools.javac.util.Context -import io.micronaut.inject.annotation.AnnotationMetadataWriter -import io.micronaut.inject.annotation.JavaAnnotationMetadataBuilder -import io.micronaut.inject.writer.BeanConfigurationWriter import io.micronaut.core.annotation.AnnotationMetadata import io.micronaut.core.naming.NameUtils -import io.micronaut.inject.BeanConfiguration -import io.micronaut.inject.BeanDefinition import io.micronaut.inject.annotation.AnnotationMetadataWriter import io.micronaut.inject.annotation.JavaAnnotationMetadataBuilder import io.micronaut.inject.writer.BeanConfigurationWriter diff --git a/inject-java/src/test/groovy/io/micronaut/inject/concurrency/JavaConcurrentSingleAccessSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/concurrency/JavaConcurrentSingleAccessSpec.groovy index f65adda4844..670d5c5befb 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/concurrency/JavaConcurrentSingleAccessSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/concurrency/JavaConcurrentSingleAccessSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.concurrency -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesSpec.groovy index ce5a2e0b1f3..da482f92abd 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/configproperties/ConfigurationPropertiesSpec.groovy @@ -18,10 +18,6 @@ package io.micronaut.inject.configproperties import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext import io.micronaut.context.env.PropertySource -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.MapPropertySource -import io.micronaut.context.env.PropertySource import spock.lang.Specification class ConfigurationPropertiesSpec extends Specification { diff --git a/inject-java/src/test/groovy/io/micronaut/inject/configproperties/PrimitiveConfigurationPropertiesSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/configproperties/PrimitiveConfigurationPropertiesSpec.groovy index b8e120cfb0e..768a69570ab 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/configproperties/PrimitiveConfigurationPropertiesSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/configproperties/PrimitiveConfigurationPropertiesSpec.groovy @@ -18,10 +18,6 @@ package io.micronaut.inject.configproperties import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext import io.micronaut.context.env.PropertySource -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.MapPropertySource -import io.micronaut.context.env.PropertySource import spock.lang.Specification class PrimitiveConfigurationPropertiesSpec extends Specification { diff --git a/inject-java/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy index c46c83a8810..db77e99aac3 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/configproperties/ValidatedConfigurationSpec.groovy @@ -19,11 +19,6 @@ import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext import io.micronaut.context.env.PropertySource import io.micronaut.context.exceptions.BeanInstantiationException -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.MapPropertySource -import io.micronaut.context.env.PropertySource -import io.micronaut.context.exceptions.BeanInstantiationException import spock.lang.Specification import javax.validation.Validation diff --git a/inject-java/src/test/groovy/io/micronaut/inject/configproperties/inheritance/ConfigurationPropertiesInheritanceSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/configproperties/inheritance/ConfigurationPropertiesInheritanceSpec.groovy index eb1e702c3a8..589b32d0973 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/configproperties/inheritance/ConfigurationPropertiesInheritanceSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/configproperties/inheritance/ConfigurationPropertiesInheritanceSpec.groovy @@ -18,10 +18,6 @@ package io.micronaut.inject.configproperties.inheritance import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext import io.micronaut.context.env.PropertySource -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.MapPropertySource -import io.micronaut.context.env.PropertySource import spock.lang.Specification /** * @author Graeme Rocher diff --git a/inject-java/src/test/groovy/io/micronaut/inject/configurations/RequiresBeanSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/configurations/RequiresBeanSpec.groovy index d2b2fd6dc04..67bfd8d2c69 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/configurations/RequiresBeanSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/configurations/RequiresBeanSpec.groovy @@ -26,18 +26,6 @@ import io.micronaut.inject.configurations.requiresconditiontrue.TrueBean import io.micronaut.inject.configurations.requiresconfig.RequiresConfig import io.micronaut.inject.configurations.requiresproperty.RequiresProperty import io.micronaut.inject.configurations.requiressdk.RequiresJava9 -import io.micronaut.context.ApplicationContext -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.env.MapPropertySource -import io.micronaut.context.env.PropertySource -import io.micronaut.inject.configurations.requiresbean.RequiresBean -import io.micronaut.inject.configurations.requiresconditionfalse.TravisBean -import io.micronaut.inject.configurations.requiresconditiontrue.TrueBean -import io.micronaut.inject.configurations.requiresconfig.RequiresConfig -import io.micronaut.inject.configurations.requiresproperty.RequiresProperty -import io.micronaut.inject.configurations.requiressdk.RequiresJava9 import spock.lang.Specification class RequiresBeanSpec extends Specification { diff --git a/inject-java/src/test/groovy/io/micronaut/inject/constructor/arrayinjection/ConstructorArrayInjectionSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/constructor/arrayinjection/ConstructorArrayInjectionSpec.groovy index ca929d0243a..72dde3438e2 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/constructor/arrayinjection/ConstructorArrayInjectionSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/constructor/arrayinjection/ConstructorArrayInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor.arrayinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/constructor/collectioninjection/ConstructorCollectionInjectionSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/constructor/collectioninjection/ConstructorCollectionInjectionSpec.groovy index 56703ba523e..fab95483d38 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/constructor/collectioninjection/ConstructorCollectionInjectionSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/constructor/collectioninjection/ConstructorCollectionInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor.collectioninjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/constructor/factoryinjection/ConstructorFactorySpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/constructor/factoryinjection/ConstructorFactorySpec.groovy index 3e0b3c52fc5..c1604fecb49 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/constructor/factoryinjection/ConstructorFactorySpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/constructor/factoryinjection/ConstructorFactorySpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor.factoryinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/constructor/interfaceinjection/ConstructorWithInterfaceSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/constructor/interfaceinjection/ConstructorWithInterfaceSpec.groovy index f14b94f8dda..c2dfa3c3f27 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/constructor/interfaceinjection/ConstructorWithInterfaceSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/constructor/interfaceinjection/ConstructorWithInterfaceSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor.interfaceinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/constructor/multipleinjection/ConstructorMultipleInjectionSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/constructor/multipleinjection/ConstructorMultipleInjectionSpec.groovy index 37c247ea820..5d5cafdb698 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/constructor/multipleinjection/ConstructorMultipleInjectionSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/constructor/multipleinjection/ConstructorMultipleInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor.multipleinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/constructor/nullableinjection/ConstructorNullableInjectionSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/constructor/nullableinjection/ConstructorNullableInjectionSpec.groovy index a4ee0b2537d..5f9a1fbb5be 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/constructor/nullableinjection/ConstructorNullableInjectionSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/constructor/nullableinjection/ConstructorNullableInjectionSpec.groovy @@ -18,10 +18,6 @@ package io.micronaut.inject.constructor.nullableinjection import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.DependencyInjectionException -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.exceptions.DependencyInjectionException -import io.micronaut.inject.BeanDefinition import spock.lang.Specification class ConstructorNullableInjectionSpec extends Specification { diff --git a/inject-java/src/test/groovy/io/micronaut/inject/constructor/optionalinjection/ConstructorOptionalSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/constructor/optionalinjection/ConstructorOptionalSpec.groovy index ba0bee580a7..701a4fa916c 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/constructor/optionalinjection/ConstructorOptionalSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/constructor/optionalinjection/ConstructorOptionalSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor.optionalinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/constructor/providerinjection/ConstructorWithProviderSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/constructor/providerinjection/ConstructorWithProviderSpec.groovy index c8bad9a2591..77e7c8680ca 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/constructor/providerinjection/ConstructorWithProviderSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/constructor/providerinjection/ConstructorWithProviderSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor.providerinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/constructor/simpleinjection/ConstructorSimpleInjectionSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/constructor/simpleinjection/ConstructorSimpleInjectionSpec.groovy index 5b66764cec1..d13d207c95f 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/constructor/simpleinjection/ConstructorSimpleInjectionSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/constructor/simpleinjection/ConstructorSimpleInjectionSpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.constructor.simpleinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.BeanDefinition import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.inject.BeanDefinition diff --git a/inject-java/src/test/groovy/io/micronaut/inject/constructor/streaminjection/ConstructorStreamSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/constructor/streaminjection/ConstructorStreamSpec.groovy index 052dde435e9..096988a60ab 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/constructor/streaminjection/ConstructorStreamSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/constructor/streaminjection/ConstructorStreamSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.constructor.streaminjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/env/EnvironmentInjectSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/env/EnvironmentInjectSpec.groovy index 66f3fdfef56..4fb9b3e5157 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/env/EnvironmentInjectSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/env/EnvironmentInjectSpec.groovy @@ -17,9 +17,6 @@ package io.micronaut.inject.env import io.micronaut.context.ApplicationContext import io.micronaut.context.env.Environment -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.env.Environment import spock.lang.Specification class EnvironmentInjectSpec extends Specification { diff --git a/inject-java/src/test/groovy/io/micronaut/inject/factory/parameterizedfactory/ParametrizedFactorySpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/factory/parameterizedfactory/ParametrizedFactorySpec.groovy index f4847a0d4af..fde3c31ff2b 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/factory/parameterizedfactory/ParametrizedFactorySpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/factory/parameterizedfactory/ParametrizedFactorySpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.inject.factory.parameterizedfactory -import io.micronaut.context.exceptions.BeanInstantiationException import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.BeanInstantiationException diff --git a/inject-java/src/test/groovy/io/micronaut/inject/failures/ctorexception/ConstructorExceptionSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/failures/ctorexception/ConstructorExceptionSpec.groovy index 8ff3fd3a55f..d7ab5072661 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/failures/ctorexception/ConstructorExceptionSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/failures/ctorexception/ConstructorExceptionSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.inject.failures.ctorexception -import io.micronaut.context.exceptions.DependencyInjectionException import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.DependencyInjectionException diff --git a/inject-java/src/test/groovy/io/micronaut/inject/field/arrayfactoryinjection/FieldArrayFactorySpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/field/arrayfactoryinjection/FieldArrayFactorySpec.groovy index 81ad11d621a..65c6f9e142e 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/field/arrayfactoryinjection/FieldArrayFactorySpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/field/arrayfactoryinjection/FieldArrayFactorySpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field.arrayfactoryinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/field/arrayinjection/FieldArrayInjectionSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/field/arrayinjection/FieldArrayInjectionSpec.groovy index 63092f7c96c..421e429e743 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/field/arrayinjection/FieldArrayInjectionSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/field/arrayinjection/FieldArrayInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field.arrayinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/field/factoryinjection/FieldFactorySpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/field/factoryinjection/FieldFactorySpec.groovy index d130fae0ea6..c2b42edba92 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/field/factoryinjection/FieldFactorySpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/field/factoryinjection/FieldFactorySpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field.factoryinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/field/listinjection/FieldListInjectionSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/field/listinjection/FieldListInjectionSpec.groovy index bbdc7a32d07..9ba13d12a76 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/field/listinjection/FieldListInjectionSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/field/listinjection/FieldListInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field.listinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/field/optionalinjection/FieldOptionalSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/field/optionalinjection/FieldOptionalSpec.groovy index bf6eaf4b063..dcca5fdd76e 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/field/optionalinjection/FieldOptionalSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/field/optionalinjection/FieldOptionalSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field.optionalinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/field/privatewithqualifier/FieldPrivateWithQualifierSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/field/privatewithqualifier/FieldPrivateWithQualifierSpec.groovy index b5d9ed6e7e5..6967f1a7712 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/field/privatewithqualifier/FieldPrivateWithQualifierSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/field/privatewithqualifier/FieldPrivateWithQualifierSpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.inject.field.privatewithqualifier -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.inject.field.protectedwithqualifier.OneA -import io.micronaut.inject.field.protectedwithqualifier.TwoA import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.inject.field.protectedwithqualifier.OneA diff --git a/inject-java/src/test/groovy/io/micronaut/inject/field/protectedwithqualifier/FieldProtectedWithQualifierSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/field/protectedwithqualifier/FieldProtectedWithQualifierSpec.groovy index 730809a2107..650f337703d 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/field/protectedwithqualifier/FieldProtectedWithQualifierSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/field/protectedwithqualifier/FieldProtectedWithQualifierSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field.protectedwithqualifier -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/field/setinjection/FieldSetInjectionSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/field/setinjection/FieldSetInjectionSpec.groovy index bd7981f13f1..a50abbad48e 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/field/setinjection/FieldSetInjectionSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/field/setinjection/FieldSetInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field.setinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/field/simpleinjection/FieldInjectionSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/field/simpleinjection/FieldInjectionSpec.groovy index 102bc9379b3..c78a1876b12 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/field/simpleinjection/FieldInjectionSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/field/simpleinjection/FieldInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field.simpleinjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/field/streaminjection/FieldStreamInjectionSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/field/streaminjection/FieldStreamInjectionSpec.groovy index 4bc4629f2b8..9cde76a2ebb 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/field/streaminjection/FieldStreamInjectionSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/field/streaminjection/FieldStreamInjectionSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.field.streaminjection -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/foreach/EachPropertySpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/foreach/EachPropertySpec.groovy index cd9d6878450..70b23eab4e0 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/foreach/EachPropertySpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/foreach/EachPropertySpec.groovy @@ -20,7 +20,6 @@ import io.micronaut.context.DefaultApplicationContext import io.micronaut.context.env.MapPropertySource import io.micronaut.context.env.PropertySource import io.micronaut.inject.qualifiers.Qualifiers -import spock.lang.Ignore import spock.lang.Specification /** * @author Graeme Rocher diff --git a/inject-java/src/test/groovy/io/micronaut/inject/inheritance/AbstractInheritanceSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/inheritance/AbstractInheritanceSpec.groovy index caa3f6ab5b9..4c6170bb564 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/inheritance/AbstractInheritanceSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/inheritance/AbstractInheritanceSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.inheritance -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/lifecycle/beancreationeventlistener/BeanCreationEventListenerSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/lifecycle/beancreationeventlistener/BeanCreationEventListenerSpec.groovy index a8fa3843125..3ed59ae1449 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/lifecycle/beancreationeventlistener/BeanCreationEventListenerSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/lifecycle/beancreationeventlistener/BeanCreationEventListenerSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.lifecycle.beancreationeventlistener -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/lifecycle/beaninitializingeventlistener/BeanInitializingEventListenerSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/lifecycle/beaninitializingeventlistener/BeanInitializingEventListenerSpec.groovy index 690b45f58ac..3d8f17f1805 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/lifecycle/beaninitializingeventlistener/BeanInitializingEventListenerSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/lifecycle/beaninitializingeventlistener/BeanInitializingEventListenerSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.lifecycle.beaninitializingeventlistener -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/method/nullableinjection/SetterWithNullableSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/method/nullableinjection/SetterWithNullableSpec.groovy index 2ab0ce9797f..cc2c065b5cc 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/method/nullableinjection/SetterWithNullableSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/method/nullableinjection/SetterWithNullableSpec.groovy @@ -18,10 +18,6 @@ package io.micronaut.inject.method.nullableinjection import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import io.micronaut.context.exceptions.DependencyInjectionException -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext -import io.micronaut.context.exceptions.DependencyInjectionException -import io.micronaut.context.exceptions.NoSuchBeanException import spock.lang.Specification class SetterWithNullableSpec extends Specification { diff --git a/inject-java/src/test/groovy/io/micronaut/inject/method/setinjection/SetterSetInjectionSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/method/setinjection/SetterSetInjectionSpec.groovy index 83a899d19b2..a8df0aff6ef 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/method/setinjection/SetterSetInjectionSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/method/setinjection/SetterSetInjectionSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.inject.method.setinjection -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/bytypespec/ByTypeSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/bytypespec/ByTypeSpec.groovy index e99b00ed00d..193562d51a7 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/bytypespec/ByTypeSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/bytypespec/ByTypeSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.qualifiers.bytypespec -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/primary/PrimarySpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/primary/PrimarySpec.groovy index 2530c330183..de384ef72cf 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/primary/PrimarySpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/primary/PrimarySpec.groovy @@ -16,8 +16,6 @@ package io.micronaut.inject.qualifiers.primary import io.micronaut.context.BeanContext -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import spock.lang.Specification /** * Created by graemerocher on 26/05/2017. diff --git a/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/replaces/ReplacesSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/replaces/ReplacesSpec.groovy index 5f6a0d0fcc6..011d6a37fe5 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/replaces/ReplacesSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/replaces/ReplacesSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.inject.qualifiers.replaces -import io.micronaut.context.BeanContext -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.BeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/secondary/SecondarySpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/secondary/SecondarySpec.groovy index 0f04aaa1cdf..d0ce46dc8ae 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/secondary/SecondarySpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/qualifiers/secondary/SecondarySpec.groovy @@ -15,9 +15,6 @@ */ package io.micronaut.inject.qualifiers.secondary -import io.micronaut.context.BeanContext -import io.micronaut.context.annotation.Secondary -import io.micronaut.inject.qualifiers.Qualifiers import io.micronaut.context.BeanContext import io.micronaut.context.annotation.Secondary import io.micronaut.inject.qualifiers.Qualifiers diff --git a/inject-java/src/test/groovy/io/micronaut/inject/scope/ContextScopeSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/scope/ContextScopeSpec.groovy index 3a45fd4af90..041226431ff 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/scope/ContextScopeSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/scope/ContextScopeSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.inject.scope -import io.micronaut.context.DefaultBeanContext import io.micronaut.context.DefaultBeanContext import spock.lang.Specification diff --git a/inject-java/src/test/groovy/io/micronaut/inject/value/singletonwithvalue/ValueSpec.groovy b/inject-java/src/test/groovy/io/micronaut/inject/value/singletonwithvalue/ValueSpec.groovy index e79cd815b4f..7c6c6a3ee33 100644 --- a/inject-java/src/test/groovy/io/micronaut/inject/value/singletonwithvalue/ValueSpec.groovy +++ b/inject-java/src/test/groovy/io/micronaut/inject/value/singletonwithvalue/ValueSpec.groovy @@ -16,8 +16,6 @@ package io.micronaut.inject.value.singletonwithvalue import io.micronaut.context.ApplicationContext -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext import spock.lang.Specification class ValueSpec extends Specification { diff --git a/jdbc/src/test/groovy/io/micronaut/jdbc/CalculatedSettingsSpec.groovy b/jdbc/src/test/groovy/io/micronaut/jdbc/CalculatedSettingsSpec.groovy index 83e6e1c4d4f..8db2ff512e4 100644 --- a/jdbc/src/test/groovy/io/micronaut/jdbc/CalculatedSettingsSpec.groovy +++ b/jdbc/src/test/groovy/io/micronaut/jdbc/CalculatedSettingsSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.jdbc -import io.micronaut.context.exceptions.ConfigurationException import io.micronaut.context.exceptions.ConfigurationException import spock.lang.Specification diff --git a/management/src/test/groovy/io/micronaut/management/endpoint/EndpointConfigurationSpec.groovy b/management/src/test/groovy/io/micronaut/management/endpoint/EndpointConfigurationSpec.groovy index 125335f7fb0..b21eeb2b522 100644 --- a/management/src/test/groovy/io/micronaut/management/endpoint/EndpointConfigurationSpec.groovy +++ b/management/src/test/groovy/io/micronaut/management/endpoint/EndpointConfigurationSpec.groovy @@ -16,7 +16,6 @@ package io.micronaut.management.endpoint import io.micronaut.context.ApplicationContext -import io.micronaut.context.env.PropertySource import io.micronaut.inject.qualifiers.Qualifiers import spock.lang.Specification diff --git a/management/src/test/groovy/io/micronaut/management/endpoint/beans/BeansEndpointSpec.groovy b/management/src/test/groovy/io/micronaut/management/endpoint/beans/BeansEndpointSpec.groovy index 8e9a5837dc2..9d8ec685b62 100644 --- a/management/src/test/groovy/io/micronaut/management/endpoint/beans/BeansEndpointSpec.groovy +++ b/management/src/test/groovy/io/micronaut/management/endpoint/beans/BeansEndpointSpec.groovy @@ -18,7 +18,6 @@ package io.micronaut.management.endpoint.beans import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpStatus import io.micronaut.runtime.server.EmbeddedServer -import spock.lang.Ignore import spock.lang.Specification import io.micronaut.http.client.* diff --git a/management/src/test/groovy/io/micronaut/management/endpoint/health/HealthEndpointSpec.groovy b/management/src/test/groovy/io/micronaut/management/endpoint/health/HealthEndpointSpec.groovy index 94ed7a45c0a..6b83bff9452 100644 --- a/management/src/test/groovy/io/micronaut/management/endpoint/health/HealthEndpointSpec.groovy +++ b/management/src/test/groovy/io/micronaut/management/endpoint/health/HealthEndpointSpec.groovy @@ -16,7 +16,6 @@ package io.micronaut.management.endpoint.health import io.micronaut.context.ApplicationContext -import io.micronaut.context.env.MapPropertySource import io.micronaut.http.HttpStatus import io.micronaut.http.client.RxHttpClient import io.micronaut.management.health.aggregator.RxJavaHealthAggregator diff --git a/management/src/test/groovy/io/micronaut/management/endpoint/stop/ServerStopEndpointSpec.groovy b/management/src/test/groovy/io/micronaut/management/endpoint/stop/ServerStopEndpointSpec.groovy index f75d21ed297..82a1b87be02 100644 --- a/management/src/test/groovy/io/micronaut/management/endpoint/stop/ServerStopEndpointSpec.groovy +++ b/management/src/test/groovy/io/micronaut/management/endpoint/stop/ServerStopEndpointSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.management.endpoint.stop -import io.micronaut.context.ApplicationContext import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest import io.micronaut.http.HttpStatus diff --git a/router/src/test/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilderSpec.groovy b/router/src/test/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilderSpec.groovy index 7a47d89820b..1e0e38b6f50 100644 --- a/router/src/test/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilderSpec.groovy +++ b/router/src/test/groovy/io/micronaut/ast/groovy/annotation/GroovyAnnotationMetadataBuilderSpec.groovy @@ -15,12 +15,6 @@ */ package io.micronaut.ast.groovy.annotation -import io.micronaut.core.annotation.AnnotationMetadata -import io.micronaut.http.HttpStatus -import io.micronaut.http.MediaType -import io.micronaut.http.annotation.Consumes -import io.micronaut.http.annotation.Error -import io.micronaut.inject.annotation.AnnotationMetadataWriter import org.codehaus.groovy.ast.ASTNode import org.codehaus.groovy.ast.ClassNode import org.codehaus.groovy.ast.MethodNode diff --git a/router/src/test/groovy/io/micronaut/context/router/AnnotationRouteBuilderSpec.groovy b/router/src/test/groovy/io/micronaut/context/router/AnnotationRouteBuilderSpec.groovy index e31f5c9c01a..38fbf38d1aa 100644 --- a/router/src/test/groovy/io/micronaut/context/router/AnnotationRouteBuilderSpec.groovy +++ b/router/src/test/groovy/io/micronaut/context/router/AnnotationRouteBuilderSpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.context.router -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.http.annotation.Controller -import io.micronaut.http.annotation.Get -import io.micronaut.http.annotation.Post import io.micronaut.context.DefaultApplicationContext import io.micronaut.http.annotation.Controller import io.micronaut.web.router.Router diff --git a/router/src/test/groovy/io/micronaut/context/router/GroovyRouteBuilderSpec.groovy b/router/src/test/groovy/io/micronaut/context/router/GroovyRouteBuilderSpec.groovy index 8acd1605930..fda77c45639 100644 --- a/router/src/test/groovy/io/micronaut/context/router/GroovyRouteBuilderSpec.groovy +++ b/router/src/test/groovy/io/micronaut/context/router/GroovyRouteBuilderSpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.context.router -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.http.HttpMethod -import io.micronaut.http.annotation.Controller import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext import io.micronaut.http.HttpMethod diff --git a/runtime/src/test/groovy/io/micronaut/bootstrap/CustomPropertySourceLocatorSpec.groovy b/runtime/src/test/groovy/io/micronaut/bootstrap/CustomPropertySourceLocatorSpec.groovy index 2cd7e470550..2ecca14d1d1 100644 --- a/runtime/src/test/groovy/io/micronaut/bootstrap/CustomPropertySourceLocatorSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/bootstrap/CustomPropertySourceLocatorSpec.groovy @@ -15,24 +15,13 @@ */ package io.micronaut.bootstrap + import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.annotation.Requires -import io.micronaut.context.env.Environment -import io.micronaut.context.env.PropertySource -import io.micronaut.context.env.PropertySourceLocator -import io.micronaut.core.io.ResourceLoader -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.annotation.Requires -import io.micronaut.context.env.Environment import io.micronaut.context.env.PropertySource -import io.micronaut.context.env.PropertySourceLocator import io.micronaut.core.io.ResourceLoader import io.micronaut.core.io.scan.ClassPathResourceLoader import spock.lang.Specification - -import javax.inject.Singleton import java.util.stream.Stream /** diff --git a/runtime/src/test/groovy/io/micronaut/cache/SyncCacheJavaSpec.groovy b/runtime/src/test/groovy/io/micronaut/cache/SyncCacheJavaSpec.groovy index b4b9205588a..18dbc9c410e 100644 --- a/runtime/src/test/groovy/io/micronaut/cache/SyncCacheJavaSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/cache/SyncCacheJavaSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.cache -import io.micronaut.context.ApplicationContext import io.micronaut.context.ApplicationContext import spock.lang.Specification diff --git a/runtime/src/test/groovy/io/micronaut/cache/SyncCacheSpec.groovy b/runtime/src/test/groovy/io/micronaut/cache/SyncCacheSpec.groovy index bad8d6d6c7f..1a40f76cd05 100644 --- a/runtime/src/test/groovy/io/micronaut/cache/SyncCacheSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/cache/SyncCacheSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.cache -import io.micronaut.context.ApplicationContext -import io.micronaut.inject.qualifiers.Qualifiers import io.reactivex.Flowable import io.reactivex.Single import io.micronaut.cache.annotation.CacheConfig diff --git a/runtime/src/test/groovy/io/micronaut/discovery/ServiceInstanceSpec.groovy b/runtime/src/test/groovy/io/micronaut/discovery/ServiceInstanceSpec.groovy index 286d5bf0e04..fa221d00237 100644 --- a/runtime/src/test/groovy/io/micronaut/discovery/ServiceInstanceSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/discovery/ServiceInstanceSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.discovery -import io.micronaut.http.HttpHeaders import io.micronaut.http.HttpHeaders import spock.lang.Specification diff --git a/runtime/src/test/groovy/io/micronaut/jackson/JacksonSetupSpec.groovy b/runtime/src/test/groovy/io/micronaut/jackson/JacksonSetupSpec.groovy index b0565aa7a1b..e7430ed15b4 100644 --- a/runtime/src/test/groovy/io/micronaut/jackson/JacksonSetupSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/jackson/JacksonSetupSpec.groovy @@ -15,13 +15,11 @@ */ package io.micronaut.jackson -import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.SerializationFeature import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext import io.micronaut.context.env.MapPropertySource -import io.micronaut.jackson.JacksonConfiguration import spock.lang.Specification /** diff --git a/runtime/src/test/groovy/io/micronaut/jackson/bind/JacksonBeanPropertyBinderSpec.groovy b/runtime/src/test/groovy/io/micronaut/jackson/bind/JacksonBeanPropertyBinderSpec.groovy index d8c158a988f..92456756f3b 100644 --- a/runtime/src/test/groovy/io/micronaut/jackson/bind/JacksonBeanPropertyBinderSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/jackson/bind/JacksonBeanPropertyBinderSpec.groovy @@ -18,9 +18,6 @@ package io.micronaut.jackson.bind import groovy.transform.EqualsAndHashCode import groovy.transform.ToString import io.micronaut.context.ApplicationContext -import io.micronaut.context.ApplicationContext -import io.micronaut.context.BeanContext -import io.micronaut.jackson.bind.JacksonBeanPropertyBinder import spock.lang.Specification import spock.lang.Unroll diff --git a/runtime/src/test/groovy/io/micronaut/jackson/env/JsonPropertySourceLoaderSpec.groovy b/runtime/src/test/groovy/io/micronaut/jackson/env/JsonPropertySourceLoaderSpec.groovy index ec12563b690..64404d90b56 100644 --- a/runtime/src/test/groovy/io/micronaut/jackson/env/JsonPropertySourceLoaderSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/jackson/env/JsonPropertySourceLoaderSpec.groovy @@ -21,15 +21,6 @@ import io.micronaut.context.env.PropertySource import io.micronaut.context.env.PropertySourceLoader import io.micronaut.core.io.service.ServiceDefinition import io.micronaut.core.io.service.SoftServiceLoader -import io.micronaut.context.env.DefaultEnvironment -import io.micronaut.context.env.Environment -import io.micronaut.context.env.PropertySource -import io.micronaut.context.env.PropertySourceLoader -import io.micronaut.context.env.yaml.YamlPropertySourceLoader -import io.micronaut.core.io.service.ServiceDefinition -import io.micronaut.core.io.service.SoftServiceLoader -import io.micronaut.jackson.env.EnvJsonPropertySourceLoader -import io.micronaut.jackson.env.JsonPropertySourceLoader import spock.lang.Specification /** diff --git a/runtime/src/test/groovy/io/micronaut/jackson/parser/JacksonProcessorSpec.groovy b/runtime/src/test/groovy/io/micronaut/jackson/parser/JacksonProcessorSpec.groovy index 57b5577b490..eba6f47236e 100644 --- a/runtime/src/test/groovy/io/micronaut/jackson/parser/JacksonProcessorSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/jackson/parser/JacksonProcessorSpec.groovy @@ -22,8 +22,6 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.node.ArrayNode import io.micronaut.context.ApplicationContext import io.micronaut.context.DefaultApplicationContext -import io.micronaut.context.ApplicationContext -import io.micronaut.context.DefaultApplicationContext import org.reactivestreams.Subscriber import org.reactivestreams.Subscription import spock.lang.AutoCleanup diff --git a/runtime/src/test/groovy/io/micronaut/reactive/converters/ReactiveTypeConversionSpec.groovy b/runtime/src/test/groovy/io/micronaut/reactive/converters/ReactiveTypeConversionSpec.groovy index d46826c76d5..03af3e1674d 100644 --- a/runtime/src/test/groovy/io/micronaut/reactive/converters/ReactiveTypeConversionSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/reactive/converters/ReactiveTypeConversionSpec.groovy @@ -15,7 +15,6 @@ */ package io.micronaut.reactive.converters -import io.micronaut.context.ApplicationContext import io.reactivex.Flowable import io.micronaut.context.ApplicationContext import io.micronaut.core.convert.ConversionService diff --git a/runtime/src/test/groovy/io/micronaut/retry/intercept/CircuitBreakerSpec.groovy b/runtime/src/test/groovy/io/micronaut/retry/intercept/CircuitBreakerSpec.groovy index 7a7b18fbd52..4b2010b6d4d 100644 --- a/runtime/src/test/groovy/io/micronaut/retry/intercept/CircuitBreakerSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/retry/intercept/CircuitBreakerSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.retry.intercept -import io.micronaut.context.ApplicationContext -import io.micronaut.context.event.ApplicationEventListener import io.reactivex.Single import io.micronaut.context.ApplicationContext import io.micronaut.context.event.ApplicationEventListener diff --git a/runtime/src/test/groovy/io/micronaut/retry/intercept/SimpleRetryInstanceSpec.groovy b/runtime/src/test/groovy/io/micronaut/retry/intercept/SimpleRetryInstanceSpec.groovy index 9af9a87d8db..ced86d9f9df 100644 --- a/runtime/src/test/groovy/io/micronaut/retry/intercept/SimpleRetryInstanceSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/retry/intercept/SimpleRetryInstanceSpec.groovy @@ -17,7 +17,6 @@ package io.micronaut.retry.intercept import io.micronaut.core.util.CollectionUtils import io.micronaut.discovery.exceptions.DiscoveryException -import io.micronaut.retry.intercept.SimpleRetry import spock.lang.Specification import java.time.Duration diff --git a/runtime/src/test/groovy/io/micronaut/runtime/executor/ExecutorSelectorSpec.groovy b/runtime/src/test/groovy/io/micronaut/runtime/executor/ExecutorSelectorSpec.groovy index 2765bb89bea..aa7ae7e512e 100644 --- a/runtime/src/test/groovy/io/micronaut/runtime/executor/ExecutorSelectorSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/runtime/executor/ExecutorSelectorSpec.groovy @@ -15,12 +15,7 @@ */ package io.micronaut.runtime.executor -import com.sun.xml.internal.ws.util.CompletedFuture import grails.gorm.transactions.Transactional -import io.micronaut.context.ApplicationContext -import io.micronaut.context.annotation.Executable -import io.micronaut.core.annotation.NonBlocking -import io.micronaut.inject.ExecutableMethod import io.reactivex.Single import io.micronaut.context.ApplicationContext import io.micronaut.context.annotation.Executable diff --git a/runtime/src/test/groovy/io/micronaut/runtime/executor/ExecutorServiceConfigSpec.groovy b/runtime/src/test/groovy/io/micronaut/runtime/executor/ExecutorServiceConfigSpec.groovy index d126068d888..305e48fde9d 100644 --- a/runtime/src/test/groovy/io/micronaut/runtime/executor/ExecutorServiceConfigSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/runtime/executor/ExecutorServiceConfigSpec.groovy @@ -16,7 +16,6 @@ package io.micronaut.runtime.executor import io.micronaut.context.ApplicationContext -import io.micronaut.context.env.PropertySource import io.micronaut.inject.qualifiers.Qualifiers import io.micronaut.scheduling.TaskExecutors import io.micronaut.scheduling.executor.ExecutorConfiguration diff --git a/runtime/src/test/groovy/io/micronaut/runtime/http/codec/TextPlainCodecSpec.groovy b/runtime/src/test/groovy/io/micronaut/runtime/http/codec/TextPlainCodecSpec.groovy index b9505c06194..3b47ec544dd 100644 --- a/runtime/src/test/groovy/io/micronaut/runtime/http/codec/TextPlainCodecSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/runtime/http/codec/TextPlainCodecSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.runtime.http.codec -import io.micronaut.core.io.buffer.ByteBuffer -import io.micronaut.core.io.buffer.ByteBufferFactory import io.micronaut.core.io.buffer.ByteBuffer import io.micronaut.core.io.buffer.ByteBufferFactory import spock.lang.Shared diff --git a/runtime/src/test/groovy/io/micronaut/scheduling/ScheduledFixedRateSpec.groovy b/runtime/src/test/groovy/io/micronaut/scheduling/ScheduledFixedRateSpec.groovy index 489201db9e0..fc43b9355b4 100644 --- a/runtime/src/test/groovy/io/micronaut/scheduling/ScheduledFixedRateSpec.groovy +++ b/runtime/src/test/groovy/io/micronaut/scheduling/ScheduledFixedRateSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.scheduling -import io.micronaut.context.ApplicationContext -import io.micronaut.context.annotation.Requires import io.micronaut.context.ApplicationContext import io.micronaut.context.annotation.Requires import io.micronaut.scheduling.annotation.Scheduled diff --git a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/endpoints/LoginControllerSpec.groovy b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/endpoints/LoginControllerSpec.groovy index 3ebd71ea890..0fcfc9f89de 100644 --- a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/endpoints/LoginControllerSpec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/endpoints/LoginControllerSpec.groovy @@ -13,10 +13,7 @@ import io.micronaut.security.authentication.UsernamePasswordCredentials import io.micronaut.security.token.jwt.encryption.EncryptionConfiguration import io.micronaut.security.token.jwt.render.BearerAccessRefreshToken import io.micronaut.security.token.jwt.signature.SignatureConfiguration -import io.micronaut.security.token.jwt.signature.rsa.RSASignatureConfiguration -import io.micronaut.security.token.jwt.signature.rsa.RSASignatureFactory import spock.lang.AutoCleanup -import spock.lang.Ignore import spock.lang.Shared import spock.lang.Specification diff --git a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/endpoints/OauthControllerPathConfigurableSpec.groovy b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/endpoints/OauthControllerPathConfigurableSpec.groovy index f25ad69424e..53e9ce1eea7 100644 --- a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/endpoints/OauthControllerPathConfigurableSpec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/endpoints/OauthControllerPathConfigurableSpec.groovy @@ -2,12 +2,10 @@ package io.micronaut.security.token.jwt.endpoints import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpResponse import io.micronaut.http.HttpStatus import io.micronaut.http.client.RxHttpClient import io.micronaut.http.client.exceptions.HttpClientResponseException import io.micronaut.runtime.server.EmbeddedServer -import io.micronaut.security.endpoints.LoginController import spock.lang.AutoCleanup import spock.lang.Shared import spock.lang.Specification diff --git a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/generator/claims/JWTClaimsSetGeneratorSpec.groovy b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/generator/claims/JWTClaimsSetGeneratorSpec.groovy index 5ac00857c5d..8e6855eab1b 100644 --- a/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/generator/claims/JWTClaimsSetGeneratorSpec.groovy +++ b/security-jwt/src/test/groovy/io/micronaut/security/token/jwt/generator/claims/JWTClaimsSetGeneratorSpec.groovy @@ -1,10 +1,7 @@ package io.micronaut.security.token.jwt.generator.claims import io.micronaut.security.authentication.UserDetails -import io.micronaut.security.config.SecurityConfiguration import io.micronaut.security.token.config.TokenConfiguration -import io.micronaut.security.token.jwt.generator.claims.JWTClaimsSetGenerator -import io.micronaut.security.token.jwt.generator.claims.JwtClaims import spock.lang.Specification class JWTClaimsSetGeneratorSpec extends Specification { diff --git a/session/src/test/groovy/io/micronaut/session/InMemorySessionStoreSpec.groovy b/session/src/test/groovy/io/micronaut/session/InMemorySessionStoreSpec.groovy index d4d1ce174b7..41dc93116c1 100644 --- a/session/src/test/groovy/io/micronaut/session/InMemorySessionStoreSpec.groovy +++ b/session/src/test/groovy/io/micronaut/session/InMemorySessionStoreSpec.groovy @@ -15,19 +15,15 @@ */ package io.micronaut.session -import io.micronaut.context.ApplicationContext -import io.micronaut.context.event.ApplicationEventListener import io.micronaut.context.ApplicationContext import io.micronaut.context.event.ApplicationEventListener import io.micronaut.session.event.AbstractSessionEvent import io.micronaut.session.event.SessionCreatedEvent import io.micronaut.session.event.SessionDeletedEvent -import io.micronaut.session.event.SessionDestroyedEvent import spock.lang.Specification import spock.util.concurrent.PollingConditions import javax.inject.Singleton -import java.time.Instant /** * @author Graeme Rocher diff --git a/session/src/test/groovy/io/micronaut/session/http/CookieHttpSessionStrategySpec.groovy b/session/src/test/groovy/io/micronaut/session/http/CookieHttpSessionStrategySpec.groovy index 5d422529920..f1927e6885e 100644 --- a/session/src/test/groovy/io/micronaut/session/http/CookieHttpSessionStrategySpec.groovy +++ b/session/src/test/groovy/io/micronaut/session/http/CookieHttpSessionStrategySpec.groovy @@ -15,14 +15,6 @@ */ package io.micronaut.session.http -import io.micronaut.core.convert.ConversionService -import io.micronaut.http.HttpHeaders -import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpResponse -import io.micronaut.http.cookie.Cookie -import io.micronaut.http.netty.cookies.NettyCookie -import io.micronaut.http.server.HttpServerConfiguration -import io.micronaut.http.server.netty.NettyHttpRequest import io.netty.channel.ChannelHandlerContext import io.netty.handler.codec.http.DefaultFullHttpRequest import io.netty.handler.codec.http.HttpMethod diff --git a/test-suite/src/test/groovy/io/micronaut/docs/server/body/MessageControllerSpec.groovy b/test-suite/src/test/groovy/io/micronaut/docs/server/body/MessageControllerSpec.groovy index 94f393435d1..82be6b0e419 100644 --- a/test-suite/src/test/groovy/io/micronaut/docs/server/body/MessageControllerSpec.groovy +++ b/test-suite/src/test/groovy/io/micronaut/docs/server/body/MessageControllerSpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.docs.server.body -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.MediaType -import io.micronaut.http.client.HttpClient import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest import io.micronaut.http.MediaType diff --git a/test-suite/src/test/groovy/io/micronaut/docs/server/filters/TraceFilterSpec.groovy b/test-suite/src/test/groovy/io/micronaut/docs/server/filters/TraceFilterSpec.groovy index 184ca1a18c0..0dfa6997968 100644 --- a/test-suite/src/test/groovy/io/micronaut/docs/server/filters/TraceFilterSpec.groovy +++ b/test-suite/src/test/groovy/io/micronaut/docs/server/filters/TraceFilterSpec.groovy @@ -15,10 +15,6 @@ */ package io.micronaut.docs.server.filters -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpResponse -import io.micronaut.http.client.HttpClient import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest import io.micronaut.http.HttpResponse diff --git a/test-suite/src/test/groovy/io/micronaut/docs/server/intro/HelloClientSpec.groovy b/test-suite/src/test/groovy/io/micronaut/docs/server/intro/HelloClientSpec.groovy index 7375f1d419d..28020ddd2d9 100644 --- a/test-suite/src/test/groovy/io/micronaut/docs/server/intro/HelloClientSpec.groovy +++ b/test-suite/src/test/groovy/io/micronaut/docs/server/intro/HelloClientSpec.groovy @@ -16,7 +16,6 @@ package io.micronaut.docs.server.intro import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest // tag::imports[] diff --git a/test-suite/src/test/groovy/io/micronaut/docs/server/json/PersonControllerSpec.groovy b/test-suite/src/test/groovy/io/micronaut/docs/server/json/PersonControllerSpec.groovy index f590525eb19..72e48013014 100644 --- a/test-suite/src/test/groovy/io/micronaut/docs/server/json/PersonControllerSpec.groovy +++ b/test-suite/src/test/groovy/io/micronaut/docs/server/json/PersonControllerSpec.groovy @@ -15,12 +15,6 @@ */ package io.micronaut.docs.server.json -import io.micronaut.context.ApplicationContext -import io.micronaut.http.HttpRequest -import io.micronaut.http.HttpResponse -import io.micronaut.http.HttpStatus -import io.micronaut.http.client.RxHttpClient -import io.micronaut.http.client.exceptions.HttpClientResponseException import io.micronaut.context.ApplicationContext import io.micronaut.http.HttpRequest import io.micronaut.http.HttpResponse diff --git a/test-suite/src/test/groovy/io/micronaut/docs/server/request/MessageControllerSpec.groovy b/test-suite/src/test/groovy/io/micronaut/docs/server/request/MessageControllerSpec.groovy index 04f3658fa35..d963b289773 100644 --- a/test-suite/src/test/groovy/io/micronaut/docs/server/request/MessageControllerSpec.groovy +++ b/test-suite/src/test/groovy/io/micronaut/docs/server/request/MessageControllerSpec.groovy @@ -15,8 +15,6 @@ */ package io.micronaut.docs.server.request -import io.micronaut.context.ApplicationContext -import io.micronaut.http.client.HttpClient import io.micronaut.context.ApplicationContext import io.micronaut.http.client.HttpClient import io.micronaut.runtime.server.EmbeddedServer diff --git a/test-suite/src/test/groovy/io/micronaut/docs/server/sse/HeadlineControllerSpec.groovy b/test-suite/src/test/groovy/io/micronaut/docs/server/sse/HeadlineControllerSpec.groovy index 391984a5f09..1cc75df29d2 100644 --- a/test-suite/src/test/groovy/io/micronaut/docs/server/sse/HeadlineControllerSpec.groovy +++ b/test-suite/src/test/groovy/io/micronaut/docs/server/sse/HeadlineControllerSpec.groovy @@ -20,8 +20,6 @@ import com.launchdarkly.eventsource.EventSource import com.launchdarkly.eventsource.MessageEvent import io.micronaut.context.ApplicationContext import io.micronaut.http.sse.Event -import io.micronaut.context.ApplicationContext -import io.micronaut.http.sse.Event import io.micronaut.runtime.server.EmbeddedServer import spock.lang.AutoCleanup import spock.lang.Shared diff --git a/test-suite/src/test/groovy/io/micronaut/tracing/jaeger/HttpTracingSpec.groovy b/test-suite/src/test/groovy/io/micronaut/tracing/jaeger/HttpTracingSpec.groovy index 5704441e3bd..55b07e0bc61 100644 --- a/test-suite/src/test/groovy/io/micronaut/tracing/jaeger/HttpTracingSpec.groovy +++ b/test-suite/src/test/groovy/io/micronaut/tracing/jaeger/HttpTracingSpec.groovy @@ -15,10 +15,8 @@ */ package io.micronaut.tracing.jaeger -import io.jaegertracing.Span import io.jaegertracing.reporters.InMemoryReporter import io.micronaut.context.ApplicationContext -import io.micronaut.context.env.PropertySource import io.micronaut.http.HttpResponse import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Get @@ -29,7 +27,6 @@ import io.micronaut.runtime.server.EmbeddedServer import io.opentracing.Tracer import io.reactivex.Single import io.reactivex.schedulers.Schedulers -import spock.lang.Ignore import spock.lang.Specification import spock.util.concurrent.PollingConditions diff --git a/tracing/src/test/groovy/io/micronaut/tracing/brave/BraveTracerFactorySpec.groovy b/tracing/src/test/groovy/io/micronaut/tracing/brave/BraveTracerFactorySpec.groovy index b326893cbeb..6511860b7cd 100644 --- a/tracing/src/test/groovy/io/micronaut/tracing/brave/BraveTracerFactorySpec.groovy +++ b/tracing/src/test/groovy/io/micronaut/tracing/brave/BraveTracerFactorySpec.groovy @@ -20,8 +20,6 @@ import brave.http.HttpClientHandler import brave.http.HttpServerHandler import brave.http.HttpTracing import io.micronaut.context.ApplicationContext -import io.micronaut.context.env.PropertySource -import io.micronaut.context.exceptions.NoSuchBeanException import io.micronaut.tracing.brave.sender.HttpClientSender import io.opentracing.Tracer import io.opentracing.noop.NoopTracer diff --git a/tracing/src/test/groovy/io/micronaut/tracing/brave/HttpTracingSpec.groovy b/tracing/src/test/groovy/io/micronaut/tracing/brave/HttpTracingSpec.groovy index 0f9e921ebd5..0b64170d0f0 100644 --- a/tracing/src/test/groovy/io/micronaut/tracing/brave/HttpTracingSpec.groovy +++ b/tracing/src/test/groovy/io/micronaut/tracing/brave/HttpTracingSpec.groovy @@ -15,11 +15,9 @@ */ package io.micronaut.tracing.brave -import brave.Span import brave.SpanCustomizer import brave.propagation.StrictCurrentTraceContext import io.micronaut.context.ApplicationContext -import io.micronaut.context.env.PropertySource import io.micronaut.http.HttpResponse import io.micronaut.http.annotation.Controller import io.micronaut.http.annotation.Get @@ -27,7 +25,6 @@ import io.micronaut.http.client.Client import io.micronaut.http.client.HttpClient import io.micronaut.http.client.exceptions.HttpClientResponseException import io.micronaut.runtime.server.EmbeddedServer -import io.reactivex.Flowable import io.reactivex.Single import io.reactivex.schedulers.Schedulers import spock.lang.Specification diff --git a/tracing/src/test/groovy/io/micronaut/tracing/brave/HystrixSpec.groovy b/tracing/src/test/groovy/io/micronaut/tracing/brave/HystrixSpec.groovy index c8194fb6e45..87ad306d021 100644 --- a/tracing/src/test/groovy/io/micronaut/tracing/brave/HystrixSpec.groovy +++ b/tracing/src/test/groovy/io/micronaut/tracing/brave/HystrixSpec.groovy @@ -18,7 +18,6 @@ package io.micronaut.tracing.brave import brave.SpanCustomizer import io.micronaut.configurations.hystrix.annotation.HystrixCommand import io.micronaut.context.ApplicationContext -import io.micronaut.context.env.PropertySource import io.micronaut.tracing.annotation.NewSpan import io.reactivex.Single import spock.lang.Specification diff --git a/tracing/src/test/groovy/io/micronaut/tracing/brave/TraceInterceptorSpec.groovy b/tracing/src/test/groovy/io/micronaut/tracing/brave/TraceInterceptorSpec.groovy index 002ca9f7d7e..07f58a95ed6 100644 --- a/tracing/src/test/groovy/io/micronaut/tracing/brave/TraceInterceptorSpec.groovy +++ b/tracing/src/test/groovy/io/micronaut/tracing/brave/TraceInterceptorSpec.groovy @@ -17,7 +17,6 @@ package io.micronaut.tracing.brave import brave.SpanCustomizer import io.micronaut.context.ApplicationContext -import io.micronaut.context.env.PropertySource import io.micronaut.tracing.annotation.ContinueSpan import io.micronaut.tracing.annotation.NewSpan import io.micronaut.tracing.annotation.SpanTag