GERONIMO-6553 apply code cleanup
git-svn-id: https://svn.apache.org/repos/asf/geronimo/specs/trunk@1796658 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/event/Event.java b/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/event/Event.java
index 3b94bde..000e026 100644
--- a/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/event/Event.java
+++ b/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/event/Event.java
@@ -20,8 +20,6 @@
import java.lang.annotation.Annotation;
import java.util.concurrent.CompletionStage;
-import java.util.concurrent.Executor;
-
import javax.enterprise.util.TypeLiteral;
/**
diff --git a/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java b/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
index 6ba1fbb..64ae14f 100644
--- a/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
+++ b/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
@@ -24,7 +24,6 @@
import javax.enterprise.event.Reception;
import javax.enterprise.event.TransactionPhase;
-import javax.naming.event.*;
/**
* <p>ObserverMethod is the SPI to handle an observer method, which is
diff --git a/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/configurator/ProducerConfigurator.java b/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/configurator/ProducerConfigurator.java
index deb3a19..129a128 100644
--- a/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/configurator/ProducerConfigurator.java
+++ b/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/configurator/ProducerConfigurator.java
@@ -20,7 +20,6 @@
package javax.enterprise.inject.spi.configurator;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Instance;
import java.util.function.Consumer;
import java.util.function.Function;
diff --git a/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java b/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java
index 58723b2..17c2061 100644
--- a/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java
+++ b/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java
@@ -133,7 +133,7 @@
return false;
}
- if(value == null && annotValue == null)
+ if(value == null)
{
continue;
}
@@ -197,7 +197,7 @@
}
}
- else if (value != null && annotValue != null)
+ else if (annotValue != null)
{
if (!value.equals(annotValue))
{
