You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by st...@apache.org on 2017/05/29 16:11:06 UTC
svn commit: r1796658 - in
/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise:
event/Event.java inject/spi/ObserverMethod.java
inject/spi/configurator/ProducerConfigurator.java util/AnnotationLiteral.java
Author: struberg
Date: Mon May 29 16:11:06 2017
New Revision: 1796658
URL: http://svn.apache.org/viewvc?rev=1796658&view=rev
Log:
GERONIMO-6553 apply code cleanup
Modified:
geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/event/Event.java
geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/configurator/ProducerConfigurator.java
geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java
Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/event/Event.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/event/Event.java?rev=1796658&r1=1796657&r2=1796658&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/event/Event.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/event/Event.java Mon May 29 16:11:06 2017
@@ -20,8 +20,6 @@ package javax.enterprise.event;
import java.lang.annotation.Annotation;
import java.util.concurrent.CompletionStage;
-import java.util.concurrent.Executor;
-
import javax.enterprise.util.TypeLiteral;
/**
Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java?rev=1796658&r1=1796657&r2=1796658&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java Mon May 29 16:11:06 2017
@@ -24,7 +24,6 @@ import java.util.Set;
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
Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/configurator/ProducerConfigurator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/configurator/ProducerConfigurator.java?rev=1796658&r1=1796657&r2=1796658&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/configurator/ProducerConfigurator.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/configurator/ProducerConfigurator.java Mon May 29 16:11:06 2017
@@ -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;
Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java?rev=1796658&r1=1796657&r2=1796658&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java Mon May 29 16:11:06 2017
@@ -133,7 +133,7 @@ public abstract class AnnotationLiteral<
return false;
}
- if(value == null && annotValue == null)
+ if(value == null)
{
continue;
}
@@ -197,7 +197,7 @@ public abstract class AnnotationLiteral<
}
}
- else if (value != null && annotValue != null)
+ else if (annotValue != null)
{
if (!value.equals(annotValue))
{