This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 46b13cc6285f900e94d043d5832059bc1c18c5e8 Author: Mark Struberg <[email protected]> AuthorDate: Sun Jun 7 22:28:05 2020 +0200 remove unused imports --- .../main/java/org/apache/webbeans/portable/InjectionTargetImpl.java | 3 ++- .../apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java | 1 - .../src/test/java/org/apache/webbeans/test/AbstractUnitTest.java | 3 --- .../webbeans/test/component/decorator/clean/ServiceDecorator.java | 1 - .../webbeans/test/configurator/AnnotatedTypeConfiguratorImplTest.java | 2 -- .../test/java/org/apache/webbeans/test/contexts/SerializationTest.java | 1 - .../webbeans/test/contexts/conversation/ConversationScopedTest.java | 1 - .../webbeans/test/decorators/tests/ConversationDecoratorTest.java | 1 - .../webbeans/test/decorators/tests/ExtendedGenericDecoratorTest.java | 1 - .../test/java/org/apache/webbeans/test/injection/generics/MyBean.java | 2 -- .../test/interceptors/extension/BeforeBeanDiscoveryImplTest.java | 1 - .../test/interceptors/factory/beans/ClassInterceptedClass.java | 1 - .../org/apache/webbeans/test/lifecycle/ExceptionOnCallbackTest.java | 1 - .../org/apache/webbeans/test/portable/events/PortableAddBeanTest.java | 1 - .../java/org/apache/webbeans/test/producer/AmbigousProducerTest.java | 1 - .../webbeans/test/producer/specializes/SpecializesProducer1Test.java | 3 --- .../org/apache/webbeans/test/proxy/unproxyable/AllowProxyingTest.java | 1 - .../org/apache/webbeans/test/tests/MultipleTimeTheSameBindingTest.java | 2 -- .../src/test/java/org/apache/webbeans/test/util/GenericsUtilTest.java | 1 - .../java/org/apache/webbeans/web/tests/ConversationLoggingTest.java | 3 --- 20 files changed, 2 insertions(+), 29 deletions(-) diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java index 3ad9c38..0134846 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java @@ -34,6 +34,7 @@ import org.apache.webbeans.intercept.LifecycleInterceptorInvocationContext; import org.apache.webbeans.logger.WebBeansLoggerFacade; import org.apache.webbeans.proxy.InterceptorDecoratorProxyFactory; import org.apache.webbeans.proxy.InterceptorHandler; +import org.apache.webbeans.proxy.NormalScopeProxyFactory; import org.apache.webbeans.proxy.OwbInterceptorProxy; import org.apache.webbeans.proxy.OwbNormalScopeProxy; import org.apache.webbeans.spi.ResourceInjectionService; @@ -330,7 +331,7 @@ public class InjectionTargetImpl<T> extends AbstractProducer<T> implements Injec { if (instance instanceof OwbNormalScopeProxy) { - instance = webBeansContext.getNormalScopeProxyFactory().unwrapInstance(instance); + instance = NormalScopeProxyFactory.unwrapInstance(instance); } Map<Interceptor<?>, ?> interceptorInstances = null; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java index 91772b0..3e047c6 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java @@ -42,7 +42,6 @@ import java.nio.charset.StandardCharsets; import java.util.Enumeration; import java.util.Properties; import java.util.Set; -import java.util.function.Consumer; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/AbstractUnitTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/AbstractUnitTest.java index 054f1af..3323a6f 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/AbstractUnitTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/AbstractUnitTest.java @@ -20,7 +20,6 @@ package org.apache.webbeans.test; import static java.util.stream.Collectors.toMap; -import org.apache.webbeans.config.OpenWebBeansConfiguration; import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.config.WebBeansFinder; import org.apache.webbeans.corespi.DefaultSingletonService; @@ -41,7 +40,6 @@ import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.Extension; import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Arrays; @@ -51,7 +49,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.function.BinaryOperator; import java.util.stream.Collector; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java index 5032abc..687d4f9 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecorator.java @@ -22,7 +22,6 @@ import javax.decorator.Delegate; import javax.decorator.Decorator; import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.Inject; -import javax.inject.Named; import org.apache.webbeans.test.annotation.binding.Binding1; import org.apache.webbeans.test.component.service.IService; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/AnnotatedTypeConfiguratorImplTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/AnnotatedTypeConfiguratorImplTest.java index fb534b5..02c001a 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/AnnotatedTypeConfiguratorImplTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/configurator/AnnotatedTypeConfiguratorImplTest.java @@ -24,7 +24,6 @@ import org.junit.Test; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AnnotatedMethod; -import javax.enterprise.inject.spi.AnnotatedParameter; import javax.enterprise.inject.spi.AnnotatedType; import javax.enterprise.inject.spi.Extension; import javax.enterprise.inject.spi.ProcessAnnotatedType; @@ -36,7 +35,6 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.util.List; import java.util.Set; import java.util.function.Consumer; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/SerializationTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/SerializationTest.java index 1704d5a..09f6fa3 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/SerializationTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/SerializationTest.java @@ -62,7 +62,6 @@ import javax.enterprise.inject.spi.BeanManager; import java.io.*; import java.util.ArrayList; import java.util.Collection; -import java.util.Properties; import java.util.Set; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/conversation/ConversationScopedTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/conversation/ConversationScopedTest.java index d7502a2..d3b4512 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/conversation/ConversationScopedTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/conversation/ConversationScopedTest.java @@ -20,7 +20,6 @@ package org.apache.webbeans.test.contexts.conversation; import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.RequestScoped; -import javax.enterprise.context.SessionScoped; import javax.enterprise.context.spi.Context; import org.junit.Assert; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ConversationDecoratorTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ConversationDecoratorTest.java index c613c11..785fb11 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ConversationDecoratorTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ConversationDecoratorTest.java @@ -32,7 +32,6 @@ import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.conversation.DefaultConversationService; import org.apache.webbeans.test.AbstractUnitTest; import org.apache.webbeans.test.decorators.common.ConversationDecorator; -import org.apache.webbeans.spi.ConversationService; import org.junit.Ignore; import org.junit.Test; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedGenericDecoratorTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedGenericDecoratorTest.java index d0fe401..85b12e4 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedGenericDecoratorTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedGenericDecoratorTest.java @@ -28,7 +28,6 @@ import javax.inject.Inject; import org.junit.Assert; import org.apache.webbeans.test.AbstractUnitTest; -import org.junit.Ignore; import org.junit.Test; /** diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/MyBean.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/MyBean.java index 6b8362a..0de1ccc 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/MyBean.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/MyBean.java @@ -18,8 +18,6 @@ */ package org.apache.webbeans.test.injection.generics; -import org.apache.webbeans.component.InstanceBean; - import javax.enterprise.inject.Instance; import javax.inject.Inject; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/extension/BeforeBeanDiscoveryImplTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/extension/BeforeBeanDiscoveryImplTest.java index 88f3134..f5ac80f 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/extension/BeforeBeanDiscoveryImplTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/extension/BeforeBeanDiscoveryImplTest.java @@ -31,7 +31,6 @@ import javax.enterprise.inject.spi.AnnotatedType; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.enterprise.inject.spi.Extension; -import javax.enterprise.util.AnnotationLiteral; import javax.enterprise.util.Nonbinding; import javax.interceptor.AroundConstruct; import javax.interceptor.AroundInvoke; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/factory/beans/ClassInterceptedClass.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/factory/beans/ClassInterceptedClass.java index 3a4105e..a5957a5 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/factory/beans/ClassInterceptedClass.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/factory/beans/ClassInterceptedClass.java @@ -22,7 +22,6 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.enterprise.context.RequestScoped; -import org.apache.webbeans.test.component.intercept.webbeans.bindings.Secure; import org.apache.webbeans.test.proxy.beans.DummyBean; import org.apache.webbeans.test.component.intercept.webbeans.bindings.Transactional; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/lifecycle/ExceptionOnCallbackTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/lifecycle/ExceptionOnCallbackTest.java index 61ee2dc..f3769ee 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/lifecycle/ExceptionOnCallbackTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/lifecycle/ExceptionOnCallbackTest.java @@ -19,7 +19,6 @@ package org.apache.webbeans.test.lifecycle; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddBeanTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddBeanTest.java index 75b0d77..0694e6c 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddBeanTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddBeanTest.java @@ -30,7 +30,6 @@ import java.util.Collection; import javax.enterprise.context.Dependent; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; -import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.BeforeBeanDiscovery; import javax.enterprise.inject.spi.Extension; import javax.enterprise.inject.spi.InjectionPoint; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/AmbigousProducerTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/AmbigousProducerTest.java index 3c07974..d051ac1 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/AmbigousProducerTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/AmbigousProducerTest.java @@ -26,7 +26,6 @@ import javax.enterprise.inject.AmbiguousResolutionException; import org.junit.Assert; import org.apache.webbeans.exception.WebBeansConfigurationException; -import javax.enterprise.inject.spi.DeploymentException; import org.apache.webbeans.exception.WebBeansDeploymentException; import org.apache.webbeans.test.AbstractUnitTest; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/specializes/SpecializesProducer1Test.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/specializes/SpecializesProducer1Test.java index b71be97..a4fe136 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/specializes/SpecializesProducer1Test.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/specializes/SpecializesProducer1Test.java @@ -19,11 +19,8 @@ package org.apache.webbeans.test.producer.specializes; import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.Collection; import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; import javax.enterprise.util.AnnotationLiteral; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/proxy/unproxyable/AllowProxyingTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/proxy/unproxyable/AllowProxyingTest.java index cfca7ff..2ea3432 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/proxy/unproxyable/AllowProxyingTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/proxy/unproxyable/AllowProxyingTest.java @@ -20,7 +20,6 @@ import javax.enterprise.context.Dependent; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Produces; import javax.enterprise.inject.UnproxyableResolutionException; -import javax.enterprise.inject.spi.DefinitionException; import javax.inject.Inject; import java.util.HashMap; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/MultipleTimeTheSameBindingTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/MultipleTimeTheSameBindingTest.java index 7e91efb..49fff4a 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/MultipleTimeTheSameBindingTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/MultipleTimeTheSameBindingTest.java @@ -18,10 +18,8 @@ */ package org.apache.webbeans.test.tests; -import org.apache.webbeans.annotation.DefaultLiteral; import org.apache.webbeans.component.BeanAttributesImpl; import org.apache.webbeans.test.AbstractUnitTest; -import org.apache.webbeans.test.interceptors.extension.BeforeBeanDiscoveryImplTest; import org.junit.Test; import javax.enterprise.event.Observes; diff --git a/webbeans-impl/src/test/java/org/apache/webbeans/test/util/GenericsUtilTest.java b/webbeans-impl/src/test/java/org/apache/webbeans/test/util/GenericsUtilTest.java index f8cf6dd..e1c1a14 100644 --- a/webbeans-impl/src/test/java/org/apache/webbeans/test/util/GenericsUtilTest.java +++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/util/GenericsUtilTest.java @@ -34,7 +34,6 @@ import java.lang.reflect.TypeVariable; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.Set; import org.apache.webbeans.config.OwbParametrizedTypeImpl; diff --git a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/ConversationLoggingTest.java b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/ConversationLoggingTest.java index a8e41a2..942da99 100644 --- a/webbeans-web/src/test/java/org/apache/webbeans/web/tests/ConversationLoggingTest.java +++ b/webbeans-web/src/test/java/org/apache/webbeans/web/tests/ConversationLoggingTest.java @@ -30,12 +30,9 @@ import java.util.function.Consumer; import java.util.logging.Handler; import java.util.logging.LogRecord; import java.util.logging.Logger; -import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.ConversationScoped; import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; import org.apache.webbeans.config.WebBeansContext; import org.apache.webbeans.servlet.WebBeansConfigurationListener;
