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/24 20:27:18 UTC

svn commit: r1796096 - in /geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise: context/ context/spi/ event/ inject/ inject/spi/ util/

Author: struberg
Date: Wed May 24 20:27:18 2017
New Revision: 1796096

URL: http://svn.apache.org/viewvc?rev=1796096&view=rev
Log:
GERONIMO-6553 remove superfluous modifiers etc

Modified:
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/Conversation.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/AlterableContext.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/Context.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/Contextual.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/CreationalContext.java
    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/event/Observes.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/Instance.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Annotated.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedCallable.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedConstructor.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedField.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMember.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMethod.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedParameter.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Bean.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/BeanAttributes.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/BeanManager.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/CDIProvider.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Decorator.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/EventMetadata.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionTargetFactory.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Interceptor.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/PassivationCapable.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessBean.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessInjectionTarget.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessManagedBean.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducer.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSyntheticAnnotatedType.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Producer.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProducerFactory.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Unmanaged.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java
    geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/TypeLiteral.java

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/Conversation.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/Conversation.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/Conversation.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/Conversation.java Wed May 24 20:27:18 2017
@@ -33,45 +33,45 @@ public interface Conversation
     /**
      * Starts new conversation.
      */
-    public void begin();
+    void begin();
 
     /**
      * Starts new conversation with the given id.
      * 
      * @param id conversation id.
      */
-    public void begin(String id);
+    void begin(String id);
 
     /**
      * Ends of the conversation.
      */
-    public void end();
+    void end();
 
     /**
      * @return <code>true</code> if conversation is transient, 
      *         <code>false</code> if it is a long running conversation.
      */
-    public boolean isTransient();
+    boolean isTransient();
 
     /**
      * Gets conversation id.
      * 
      * @return conversation id
      */
-    public String getId();
+    String getId();
 
     /**
      * Returns conversation time out.
      * 
      * @return conversation timeout
      */
-    public long getTimeout();
+    long getTimeout();
 
     /**
      * Sets conversation timeout in ms.
      * 
      * @param milliseconds timeout of the conversation
      */
-    public void setTimeout(long milliseconds);
+    void setTimeout(long milliseconds);
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/AlterableContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/AlterableContext.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/AlterableContext.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/AlterableContext.java Wed May 24 20:27:18 2017
@@ -26,5 +26,5 @@ package javax.enterprise.context.spi;
  */
 public interface AlterableContext extends Context
 {
-    public void destroy(Contextual<?> contextual);
+    void destroy(Contextual<?> contextual);
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/Context.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/Context.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/Context.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/Context.java Wed May 24 20:27:18 2017
@@ -51,7 +51,7 @@ public interface Context
      * 
      * @return the scope type of the context
      */
-    public Class<? extends Annotation> getScope();
+    Class<? extends Annotation> getScope();
 
     /**
      * If the context is not active, throws {@link ContextNotActiveException}.
@@ -66,7 +66,7 @@ public interface Context
      * @param creationalContext {@link CreationalContext} instance
      * @return the contextual instance or null
      */
-    public <T> T get(Contextual<T> component, CreationalContext<T> creationalContext);
+    <T> T get(Contextual<T> component, CreationalContext<T> creationalContext);
 
     /**
      * Returns the instance of the webbeans in this context if exist otherwise return null.
@@ -75,7 +75,7 @@ public interface Context
      * @param component webbeans component
      * @return the instance of the webbeans in this context if exist otherwise return null
      */
-    public <T> T get(Contextual<T> component);
+    <T> T get(Contextual<T> component);
 
     /**
      * Returns true if context is active according to the current thread,

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/Contextual.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/Contextual.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/Contextual.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/Contextual.java Wed May 24 20:27:18 2017
@@ -41,7 +41,7 @@ public interface Contextual<T>
      * @return the new instance of the webbeans component
      * @throws CreationException if any exception occurs
      */
-    public T create(CreationalContext<T> context);
+    T create(CreationalContext<T> context);
 
     /**
      * Destroys the instance. Any destroy logic is encapsulated
@@ -50,5 +50,5 @@ public interface Contextual<T>
      * @param instance already created webbeans instance
      * @param context creational context
      */
-    public void destroy(T instance, CreationalContext<T> context);
+    void destroy(T instance, CreationalContext<T> context);
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/CreationalContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/CreationalContext.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/CreationalContext.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/context/spi/CreationalContext.java Wed May 24 20:27:18 2017
@@ -52,12 +52,12 @@ public interface CreationalContext<T>
      * 
      * @param incompleteInstance incomplete webbeans instance
      */
-    public void push(T incompleteInstance);
+    void push(T incompleteInstance);
     
     /**
      * Destorys all dependent objects of the instance
      * that is being destroyed.
      */
-    public void release();
+    void release();
 
 }

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=1796096&r1=1796095&r2=1796096&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 Wed May 24 20:27:18 2017
@@ -32,12 +32,12 @@ import javax.enterprise.util.TypeLiteral
 public interface Event<T>
 {
 
-    public void fire(T event);
+    void fire(T event);
     
-    public Event<T> select(Annotation... qualifiers);
+    Event<T> select(Annotation... qualifiers);
     
-    public <U extends T> Event<U> select(Class<U> subtype, Annotation... qualifiers);
+    <U extends T> Event<U> select(Class<U> subtype, Annotation... qualifiers);
     
-    public <U extends T> Event<U> select(TypeLiteral<U> subtype, Annotation... qualifiers);
+    <U extends T> Event<U> select(TypeLiteral<U> subtype, Annotation... qualifiers);
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/event/Observes.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/event/Observes.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/event/Observes.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/event/Observes.java Wed May 24 20:27:18 2017
@@ -46,8 +46,8 @@ import java.lang.annotation.Target;
 public @interface Observes
 {
     /**Specifies whether or not call observer according to owner bean instace*/
-    public Reception notifyObserver() default Reception.ALWAYS;
+    Reception notifyObserver() default Reception.ALWAYS;
     
     /**Transaction phase*/
-    public TransactionPhase during() default TransactionPhase.IN_PROGRESS;
+    TransactionPhase during() default TransactionPhase.IN_PROGRESS;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/Instance.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/Instance.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/Instance.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/Instance.java Wed May 24 20:27:18 2017
@@ -40,7 +40,7 @@ public interface Instance<T> extends Ite
      * @param qualifiers
      * @return new child instance with given qualifiers.
      */
-    public Instance<T> select(Annotation... qualifiers);
+    Instance<T> select(Annotation... qualifiers);
     
     /**
      * Returns new child instance with given class and qualifiers.
@@ -50,7 +50,7 @@ public interface Instance<T> extends Ite
      * @param qualifiers qualifiers
      * @return new child instance with given class and qualifiers
      */
-    public <U extends T> Instance<U> select(Class<U> subtype, Annotation... qualifiers);
+    <U extends T> Instance<U> select(Class<U> subtype, Annotation... qualifiers);
     
     /**
      * Return new child instance with given class info and qualifiers.
@@ -60,21 +60,21 @@ public interface Instance<T> extends Ite
      * @param qualifiers qualifiers
      * @return new child instance with given class info and qualifiers
      */
-    public <U extends T> Instance<U> select(TypeLiteral<U> subtype, Annotation... qualifiers);
+    <U extends T> Instance<U> select(TypeLiteral<U> subtype, Annotation... qualifiers);
     
     /**
-     * Return true if resulotion is unsatisfied, false otherwise.
+     * Return true if resolution is unsatisfied, false otherwise.
      * 
-     * @return true if resulotion is unsatisfied, false otherwise
+     * @return true if resolution is unsatisfied, false otherwise
      */
-    public boolean isUnsatisfied();
+    boolean isUnsatisfied();
 
     /**
-     * Returns true if resolution is ambigious, false otherwise.
+     * Returns true if resolution is ambiguous, false otherwise.
      * 
-     * @return true if resolution is ambigious, false otherwise.
+     * @return true if resolution is ambiguous, false otherwise.
      */
-    public boolean isAmbiguous();
+    boolean isAmbiguous();
 
     /**
      * Destroy the given Contextual Instance.
@@ -82,6 +82,6 @@ public interface Instance<T> extends Ite
      * which might otherwise create mem leaks.
      * @param instance
      */
-    public void destroy(T instance);
+    void destroy(T instance);
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java Wed May 24 20:27:18 2017
@@ -33,5 +33,5 @@ public interface AfterDeploymentValidati
      * 
      * @param t throwable
      */
-    public void addDeploymentProblem(Throwable t);
+    void addDeploymentProblem(Throwable t);
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Annotated.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Annotated.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Annotated.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Annotated.java Wed May 24 20:27:18 2017
@@ -34,7 +34,7 @@ public interface Annotated
      *
      * @return type of the element
      */
-    public Type getBaseType();
+    Type getBaseType();
 
     /**
      * Returns set of type closures. Type closure means
@@ -42,7 +42,7 @@ public interface Annotated
      *
      * @return set of type closures.
      */
-    public Set<Type> getTypeClosure();
+    Set<Type> getTypeClosure();
 
     /**
      * Gets annotated element's annotation member if exist, null otherwise
@@ -51,14 +51,14 @@ public interface Annotated
      * @param annotationType class of the annotation
      * @return annotated element's annotation member if exist, null otherwise
      */
-    public <T extends Annotation> T getAnnotation(Class<T> annotationType);
+    <T extends Annotation> T getAnnotation(Class<T> annotationType);
 
     /**
      * Gets annotated member all annotations.
      *
      * @return annotated member annotations
      */
-    public Set<Annotation> getAnnotations();
+    Set<Annotation> getAnnotations();
 
     /**
      * Returns true if annotated member has annotation for given annotation type,
@@ -67,6 +67,6 @@ public interface Annotated
      * @param annotationType type of the annotation
      * @return true if annotated member has annotation for given annotation type
      */
-    public boolean isAnnotationPresent(Class<? extends Annotation> annotationType);
+    boolean isAnnotationPresent(Class<? extends Annotation> annotationType);
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedCallable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedCallable.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedCallable.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedCallable.java Wed May 24 20:27:18 2017
@@ -34,6 +34,6 @@ public interface AnnotatedCallable<X> ex
      *
      * @return list of parameters
      */
-    public List<AnnotatedParameter<X>> getParameters();
+    List<AnnotatedParameter<X>> getParameters();
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedConstructor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedConstructor.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedConstructor.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedConstructor.java Wed May 24 20:27:18 2017
@@ -32,5 +32,5 @@ public interface AnnotatedConstructor<X>
     /**
      * {@inheritDoc}
      */
-    public Constructor<X> getJavaMember();
+    Constructor<X> getJavaMember();
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedField.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedField.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedField.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedField.java Wed May 24 20:27:18 2017
@@ -32,5 +32,5 @@ public interface AnnotatedField<X> exten
     /**
      * {@inheritDoc}
      */
-    public Field getJavaMember();
+    Field getJavaMember();
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMember.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMember.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMember.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMember.java Wed May 24 20:27:18 2017
@@ -44,7 +44,7 @@ public interface AnnotatedMember<X> exte
      *
      * @return java member
      */
-    public Member getJavaMember();
+    Member getJavaMember();
 
     /**
      * Returns true if member modifiers contain static keyword
@@ -52,13 +52,13 @@ public interface AnnotatedMember<X> exte
      *
      * @return true if member modifiers contain static keyword
      */
-    public boolean isStatic();
+    boolean isStatic();
 
     /**
      * Returns member's declaring type.
      *
      * @return member's declaring type
      */
-    public AnnotatedType<X> getDeclaringType();
+    AnnotatedType<X> getDeclaringType();
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMethod.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMethod.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMethod.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMethod.java Wed May 24 20:27:18 2017
@@ -32,5 +32,5 @@ public interface AnnotatedMethod<X> exte
     /**
      * {@inheritDoc}
      */
-    public Method getJavaMember();
+    Method getJavaMember();
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedParameter.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedParameter.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedParameter.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedParameter.java Wed May 24 20:27:18 2017
@@ -32,13 +32,13 @@ public interface AnnotatedParameter<X> e
      *
      * @return parameter position
      */
-    public int getPosition();
+    int getPosition();
 
     /**
      * Returns declaring callable member.
      *
      * @return declaring callable member
      */
-    public AnnotatedCallable<X> getDeclaringCallable();
+    AnnotatedCallable<X> getDeclaringCallable();
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Bean.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Bean.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Bean.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Bean.java Wed May 24 20:27:18 2017
@@ -38,14 +38,14 @@ public interface Bean<T> extends Context
      * 
      * @return injection points
      */
-    public abstract Set<InjectionPoint> getInjectionPoints();
+    Set<InjectionPoint> getInjectionPoints();
     
     /**
      * Returns class of bean.
      * 
      * @return class of bean that it represents
      */
-    public abstract Class<?> getBeanClass();
+    Class<?> getBeanClass();
 
     /**
      * If bean is nullable return true, false
@@ -60,6 +60,6 @@ public interface Bean<T> extends Context
      * @return true if bean is nullable.
      * @deprecated since CDI-1.1. This should be ignored by the container from now on.
      */
-    public abstract boolean isNullable();
+    boolean isNullable();
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/BeanAttributes.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/BeanAttributes.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/BeanAttributes.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/BeanAttributes.java Wed May 24 20:27:18 2017
@@ -34,40 +34,40 @@ public interface BeanAttributes<T> {
      *
      * @return api types of a bean
      */
-    public abstract Set<Type> getTypes();
+    Set<Type> getTypes();
 
     /**
      * Returns qualifiers of a bean.
      *
      * @return qualifiers of a bean
      */
-    public abstract Set<Annotation> getQualifiers();
+    Set<Annotation> getQualifiers();
 
     /**
      * Returns scope of a bean.
      *
      * @return scope
      */
-    public abstract Class<? extends Annotation> getScope();
+    Class<? extends Annotation> getScope();
 
     /**
      * Returns name of a bean.
      *
      * @return name of a bean
      */
-    public abstract String getName();
+    String getName();
 
     /**
      * Returns bean stereotypes.
      *
      * @return bean stereotypes
      */
-    public Set<Class<? extends Annotation>> getStereotypes();
+    Set<Class<? extends Annotation>> getStereotypes();
 
     /**
      * Returns true if declares as policy
      *
      * @return true if declares as policy
      */
-    public boolean isAlternative();
+    boolean isAlternative();
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/BeanManager.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/BeanManager.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/BeanManager.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/BeanManager.java Wed May 24 20:27:18 2017
@@ -60,7 +60,7 @@ public interface BeanManager
      * @throws IllegalArgumentException if given bean type is not api type of the given bean object
      * @throws java.lang.IllegalStateException if this method gets called before the AfterDeploymentValidation event is fired.
      */
-    public Object getReference(Bean<?> bean, Type beanType, CreationalContext<?> ctx);
+    Object getReference(Bean<?> bean, Type beanType, CreationalContext<?> ctx);
     
     /**
      * Gets injection point bean reference.
@@ -72,14 +72,14 @@ public interface BeanManager
      * @throws AmbiguousResolutionException if more than one bean found
      * @throws java.lang.IllegalStateException if this method gets called before the AfterDeploymentValidation event is fired.
      */
-    public Object getInjectableReference(InjectionPoint injectionPoint, CreationalContext<?> ctx);
+    Object getInjectableReference(InjectionPoint injectionPoint, CreationalContext<?> ctx);
     
     /**
      * Returns a new creational context implementation.
      * 
      * @return new creational context
      */
-    public <T> CreationalContext<T> createCreationalContext(Contextual<T> contextual);
+    <T> CreationalContext<T> createCreationalContext(Contextual<T> contextual);
     
     /**
      * Returns set of beans that their api types contain
@@ -97,7 +97,7 @@ public interface BeanManager
      * @throws IllegalArgumentException same qualifier is given
      * @throws java.lang.IllegalStateException if this method gets called before the AfterBeanDiscovery event is fired.
      */
-    public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);
+    Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);
         
     /**
      * Returns set of beans with given Expression Language name.
@@ -106,7 +106,7 @@ public interface BeanManager
      * @return set of beans with given name
      * @throws java.lang.IllegalStateException if this method gets called before the AfterBeanDiscovery event is fired.
      */
-    public Set<Bean<?>> getBeans(String name);    
+    Set<Bean<?>> getBeans(String name);
         
     /**
      * Returns passivation capable bean given id.
@@ -115,7 +115,7 @@ public interface BeanManager
      * @return passivation capable bean given id
      * @throws java.lang.IllegalStateException if this method gets called before the AfterBeanDiscovery event is fired.
      */
-    public Bean<?> getPassivationCapableBean(String id);
+    Bean<?> getPassivationCapableBean(String id);
     
     /**
      * Returns a bean object that is resolved according to the type safe resolution rules.
@@ -126,7 +126,7 @@ public interface BeanManager
      * @throws AmbiguousResolutionException if ambigious exists
      * @throws java.lang.IllegalStateException if this method gets called before the AfterBeanDiscovery event is fired.
      */
-    public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);
+    <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);
         
     /**
      * Fires an event with given even object and qualifiers.
@@ -137,7 +137,7 @@ public interface BeanManager
      * @throws IllegalArgumentException given qualifier annotation is not a qualifier
      * @throws IllegalArgumentException same qualifier is given
      */
-    public void fireEvent(Object event, Annotation... qualifiers);
+    void fireEvent(Object event, Annotation... qualifiers);
         
     /**
      * Returns set of observer methods.
@@ -148,7 +148,7 @@ public interface BeanManager
      * @return set of observer methods
      * @throws java.lang.IllegalStateException if this method gets called before the AfterBeanDiscovery event is fired.
      */
-    public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, Annotation... qualifiers);
+    <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, Annotation... qualifiers);
     
     /**
      * Returns a list of decorator.
@@ -183,7 +183,7 @@ public interface BeanManager
      * @throws InjectionException if problem exist
      * @throws java.lang.IllegalStateException if this method gets called before the AfterBeanDiscovery event is fired.
      */
-    public void validate(InjectionPoint injectionPoint);
+    void validate(InjectionPoint injectionPoint);
     
     /**
      * Returns true if given type is a scope type, false otherwise.
@@ -191,7 +191,7 @@ public interface BeanManager
      * @param annotationType annotation type
      * @return true if given type is a scope type, false otherwise
      */
-    public boolean isScope(Class<? extends Annotation> annotationType);
+    boolean isScope(Class<? extends Annotation> annotationType);
     
     /**
      * Returns true if given type is a normal scope type, false otherwise.
@@ -199,7 +199,7 @@ public interface BeanManager
      * @param annotationType annotation type
      * @return true if given type is a scope type, false otherwise
      */
-    public boolean isNormalScope(Class<? extends Annotation> annotationType);
+    boolean isNormalScope(Class<? extends Annotation> annotationType);
     
     /**
      * Returns true if given type is a passivating scope type, false otherwise.
@@ -207,7 +207,7 @@ public interface BeanManager
      * @param annotationType annotation type
      * @return true if given type is a scope type, false otherwise
      */
-    public boolean isPassivatingScope(Class<? extends Annotation> annotationType);    
+    boolean isPassivatingScope(Class<? extends Annotation> annotationType);
     
 
     /**
@@ -215,8 +215,8 @@ public interface BeanManager
      * 
      * @param annotationType annotation type
      * @return true if given type is a qualifier, false otherwise
-     */    
-    public boolean isQualifier(Class<? extends Annotation> annotationType);
+     */
+    boolean isQualifier(Class<? extends Annotation> annotationType);
 
     /**
      * Check whether the 2 given qualifiers are the same.
@@ -226,21 +226,21 @@ public interface BeanManager
      * @param qualifier2
      * @return <code>true</code> if all non-nonbinding attributes are equals, <code>false</code> otherwise
      */
-    public boolean areQualifiersEquivalent(Annotation qualifier1, Annotation qualifier2);
+    boolean areQualifiersEquivalent(Annotation qualifier1, Annotation qualifier2);
 
     /**
      * @param qualifier
      * @return the hashCode of the Annotation. All {@link javax.enterprise.util.Nonbinding} fields get ignored
      */
-    public int getQualifierHashCode(Annotation qualifier);
+    int getQualifierHashCode(Annotation qualifier);
 
     /**
      * Returns true if given type is a interceptor binding, false otherwise.
      * 
      * @param annotationType annotation type
      * @return true if given type is a interceptor binding, false otherwise
-     */        
-    public boolean isInterceptorBinding(Class<? extends Annotation> annotationType);
+     */
+    boolean isInterceptorBinding(Class<? extends Annotation> annotationType);
 
     /**
      * Check whether the 2 given Interceptor Binding annotations are the same.
@@ -250,13 +250,13 @@ public interface BeanManager
      * @param interceptorBinding2
      * @return <code>true</code> if all non-nonbinding attributes are equals, <code>false</code> otherwise
      */
-    public boolean areInterceptorBindingsEquivalent(Annotation interceptorBinding1, Annotation interceptorBinding2);
+    boolean areInterceptorBindingsEquivalent(Annotation interceptorBinding1, Annotation interceptorBinding2);
 
     /**
      * @param interceptorBinding
      * @return the hashCode of the Annotation. All {@link javax.enterprise.util.Nonbinding} fields get ignored
      */
-    public int getInterceptorBindingHashCode(Annotation interceptorBinding);
+    int getInterceptorBindingHashCode(Annotation interceptorBinding);
 
 
 
@@ -266,7 +266,7 @@ public interface BeanManager
      * @param annotationType annotation type
      * @return true if given type is a stereotype, false otherwise
      */
-    public boolean isStereotype(Class<? extends Annotation> annotationType);
+    boolean isStereotype(Class<? extends Annotation> annotationType);
         
     /**
      * Returns a set of meta-annotations that are defined on the binding
@@ -274,7 +274,7 @@ public interface BeanManager
      * @param qualifier binding class
      * @return a set of meta-annotations that are defined on the binding
      */
-    public Set<Annotation> getInterceptorBindingDefinition(Class<? extends Annotation> qualifier);
+    Set<Annotation> getInterceptorBindingDefinition(Class<? extends Annotation> qualifier);
     
     /**
      * Returns a set of meta-annotations that are defined on the stereotype type.
@@ -282,7 +282,7 @@ public interface BeanManager
      * @param stereotype stereotype type class
      * @return a set of meta-annotations that are defined on the stereotype type
      */
-    public Set<Annotation> getStereotypeDefinition(Class<? extends Annotation> stereotype);
+    Set<Annotation> getStereotypeDefinition(Class<? extends Annotation> stereotype);
 
     /**
      * Returns a context with given scope type.
@@ -290,14 +290,14 @@ public interface BeanManager
      * @param scope scope type class type
      * @return a context with given scope type
      */
-    public Context getContext(Class<? extends Annotation> scope);
+    Context getContext(Class<? extends Annotation> scope);
     
     /**
      * Returns CDI container Expression Language resolver.
      * 
      * @return el resolver
      */
-    public ELResolver getELResolver();
+    ELResolver getELResolver();
     
     /**
      * Returns a {@link AnnotatedType} instance for the given
@@ -307,7 +307,7 @@ public interface BeanManager
      * @param type class
      * @return a {@link AnnotatedType} instance
      */
-    public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);
+    <T> AnnotatedType<T> createAnnotatedType(Class<T> type);
     
     /**
      * Creates a new instance of injection target Bean.
@@ -316,7 +316,7 @@ public interface BeanManager
      * @param type annotated type
      * @return injection target
      */
-    public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type);
+    <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type);
 
     /**
      * Create an {@link InjectionPoint} for an annotated field.
@@ -324,7 +324,7 @@ public interface BeanManager
      * @throws IllegalArgumentException if there is a definition error on the given field
      * @return injection point
      */
-    public InjectionPoint createInjectionPoint(AnnotatedField<?> field);
+    InjectionPoint createInjectionPoint(AnnotatedField<?> field);
 
     /**
      * Create an {@link InjectionPoint} for an annotated parameter.
@@ -332,14 +332,14 @@ public interface BeanManager
      * @throws IllegalArgumentException if there is a definition error on the given parameter
      * @return injection point
      */
-    public InjectionPoint createInjectionPoint(AnnotatedParameter<?> parameter);
+    InjectionPoint createInjectionPoint(AnnotatedParameter<?> parameter);
 
     /**
      * @param type
      * @param <T>
      * @return the InjectionTargetFactory which is able to create {@link InjectionTarget}s for the given AnnotatedType.
      */
-    public <T> InjectionTargetFactory<T> getInjectionTargetFactory(AnnotatedType<T> type);
+    <T> InjectionTargetFactory<T> getInjectionTargetFactory(AnnotatedType<T> type);
 
     /**
      * @param field
@@ -347,7 +347,7 @@ public interface BeanManager
      * @param <X>
      * @return the ProducerFactory which is able to create {@link Producer}s for the given AnnotatedField.
      */
-    public <X> ProducerFactory<X> getProducerFactory(AnnotatedField<? super X> field, Bean<X> declaringBean);
+    <X> ProducerFactory<X> getProducerFactory(AnnotatedField<? super X> field, Bean<X> declaringBean);
 
     /**
      * @param method
@@ -355,7 +355,7 @@ public interface BeanManager
      * @param <X>
      * @return the ProducerFactory which is able to create {@link Producer}s for the given AnnotatedMethod.
      */
-    public <X> ProducerFactory<X> getProducerFactory(AnnotatedMethod<? super X> method, Bean<X> declaringBean);
+    <X> ProducerFactory<X> getProducerFactory(AnnotatedMethod<? super X> method, Bean<X> declaringBean);
 
     /**
      * This method creates bean meta information from a given {@link AnnotatedType}.
@@ -367,7 +367,7 @@ public interface BeanManager
      * @param <T>
      * @return the BeanAttributes created from parsing the given AnnotatedType
      */
-    public <T> BeanAttributes<T> createBeanAttributes(AnnotatedType<T> type);
+    <T> BeanAttributes<T> createBeanAttributes(AnnotatedType<T> type);
 
     /**
      * This method creates bean meta information from a given {@link AnnotatedMember}.
@@ -378,7 +378,7 @@ public interface BeanManager
      * @param member
      * @return the BeanAttributes created from parsing the given AnnotatedType
      */
-    public BeanAttributes<?> createBeanAttributes(AnnotatedMember<?> member);
+    BeanAttributes<?> createBeanAttributes(AnnotatedMember<?> member);
 
     /**
      * Create a {@link Bean} from the given bean attributes.
@@ -389,8 +389,8 @@ public interface BeanManager
      * @param <T>
      * @return the container created Bean
      */
-    public <T> Bean<T> createBean(BeanAttributes<T> attributes, Class<T> beanClass,
-                                  InjectionTargetFactory<T> injectionTargetFactory);
+    <T> Bean<T> createBean(BeanAttributes<T> attributes, Class<T> beanClass,
+                           InjectionTargetFactory<T> injectionTargetFactory);
 
     /**
      * Create a {@link Bean} from the given bean attributes.
@@ -401,8 +401,8 @@ public interface BeanManager
      * @param <T>
      * @return the container created Bean
      */
-    public <T, X> Bean<T> createBean(BeanAttributes<T> attributes, Class<X> beanClass,
-                                     ProducerFactory<X> producerFactory);
+    <T, X> Bean<T> createBean(BeanAttributes<T> attributes, Class<X> beanClass,
+                              ProducerFactory<X> producerFactory);
 
     /**
      * Resolves the Extension instance which gets used by this very BeanManager.
@@ -413,12 +413,12 @@ public interface BeanManager
      * @param <T>
      * @return the Extension instance of this very BeanManager
      */
-    public <T extends Extension> T getExtension(Class<T> extensionClass);
+    <T extends Extension> T getExtension(Class<T> extensionClass);
 
     /**
      * Wrapped around given expression factory and add CDI functionality.
      * @param expressionFactory expression factory
      * @return wrapped expression factory
      */
-    public ExpressionFactory wrapExpressionFactory(javax.el.ExpressionFactory expressionFactory);
+    ExpressionFactory wrapExpressionFactory(javax.el.ExpressionFactory expressionFactory);
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/CDIProvider.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/CDIProvider.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/CDIProvider.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/CDIProvider.java Wed May 24 20:27:18 2017
@@ -27,5 +27,5 @@ package javax.enterprise.inject.spi;
  */
 public interface CDIProvider
 {
-    public CDI<Object> getCDI();
+    CDI<Object> getCDI();
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Decorator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Decorator.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Decorator.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Decorator.java Wed May 24 20:27:18 2017
@@ -33,16 +33,16 @@ public interface Decorator<T> extends Be
      * class annotated with &#064;{@link javax.decorator.Decorator}.
      * @return the decorated types of the decorator.
      */
-    public abstract Set<Type> getDecoratedTypes();
+    Set<Type> getDecoratedTypes();
 
     /**
      * @return the Type of the &#064;{@link javax.decorator.Delegate} injection point.
      */
-    public abstract Type getDelegateType();
+    Type getDelegateType();
 
     /**
      * @return the Qualifiers of the &#064;{@link javax.decorator.Delegate} injection point.
      */
-    public abstract Set<Annotation> getDelegateQualifiers();
+    Set<Annotation> getDelegateQualifiers();
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/EventMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/EventMetadata.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/EventMetadata.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/EventMetadata.java Wed May 24 20:27:18 2017
@@ -32,16 +32,16 @@ public interface EventMetadata {
     /**
      * @return the qualifiers which were used to fire the event
      */
-    public Set<Annotation> getQualifiers();
+    Set<Annotation> getQualifiers();
 
     /**
      * @return the {@link javax.enterprise.event.Event} InjectionPoitn or <code>null</code>
      *          if this event got fired via {@link BeanManager#fireEvent(Object, java.lang.annotation.Annotation...)}
      */
-    public InjectionPoint getInjectionPoint();
+    InjectionPoint getInjectionPoint();
 
     /**
      * @return the effective type of the fired event
      */
-    public Type getType();
+    Type getType();
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java Wed May 24 20:27:18 2017
@@ -47,14 +47,14 @@ public interface InjectionPoint
      * 
      * @return type of the injection point
      */
-    public Type getType();
+    Type getType();
 
     /**
      * Returns required qualifiers of the injection point.
      * 
      * @return qualifiers at the injection point
      */
-    public Set<Annotation> getQualifiers();
+    Set<Annotation> getQualifiers();
 
     /**
      * Returns the injection point owner bean.
@@ -65,7 +65,7 @@ public interface InjectionPoint
      * 
      * @return injection point owner bean
      */
-    public Bean<?> getBean();
+    Bean<?> getBean();
 
     /**
      * Returns appered point for injection point. One of
@@ -79,14 +79,14 @@ public interface InjectionPoint
      * 
      * @return where the injection point is appeared 
      */
-    public Member getMember();
+    Member getMember();
     
     /**
      * Returns annotated object representation of member.
      * 
      * @return annotated
      */
-    public Annotated getAnnotated();
+    Annotated getAnnotated();
     
     /**
      * Returns true if injection point is decorator delegate,
@@ -94,7 +94,7 @@ public interface InjectionPoint
      * 
      * @return true if injection point is decorator delegate
      */
-    public boolean isDelegate();
+    boolean isDelegate();
     
     /**
      * Returns true if injection point is transient,
@@ -102,5 +102,5 @@ public interface InjectionPoint
      * 
      * @return true if injection point is transient
      */
-    public boolean isTransient();
+    boolean isTransient();
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java Wed May 24 20:27:18 2017
@@ -38,20 +38,20 @@ public interface InjectionTarget<T> exte
      * @param instance bean instance
      * @param ctx creational context
      */
-    public void inject(T instance, CreationalContext<T> ctx);
+    void inject(T instance, CreationalContext<T> ctx);
     
     /**
      * Calls {@link PostConstruct} callback method if exists.
      * 
      * @param instance bean instance
      */
-    public void postConstruct(T instance);
+    void postConstruct(T instance);
 
     /**
      * Calls {@link PreDestroy} callback method if exists.
      * 
      * @param instance bean instance
-     */    
-    public void preDestroy(T instance);
+     */
+    void preDestroy(T instance);
     
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionTargetFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionTargetFactory.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionTargetFactory.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionTargetFactory.java Wed May 24 20:27:18 2017
@@ -28,5 +28,5 @@ public interface InjectionTargetFactory<
      * Creates an InjectionTarget for the given Bean
      * @param bean the Bean or <code>null</code> if the InjectionTarget should not get managed by the container.
      */
-    public InjectionTarget<T> createInjectionTarget(Bean<T> bean);
+    InjectionTarget<T> createInjectionTarget(Bean<T> bean);
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Interceptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Interceptor.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Interceptor.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Interceptor.java Wed May 24 20:27:18 2017
@@ -39,13 +39,13 @@ public interface Interceptor<T> extends
      * Usually a single Interceptor
      * @return all {@link javax.interceptor.InterceptorBinding}s handled by this interceptor.
      */
-    public abstract Set<Annotation> getInterceptorBindings();
+    Set<Annotation> getInterceptorBindings();
 
     /**
      * @param type InterceptionType in question
      * @return <code>true</code> if this interceptor handles the given InterceptionType, <code>false</code> otherwise
      */
-    public boolean intercepts(InterceptionType type);
+    boolean intercepts(InterceptionType type);
 
     /**
      * Perform the interception. This will e.g. invoke the &#064;AroundInvoke annotated method
@@ -58,6 +58,6 @@ public interface Interceptor<T> extends
      *         (if this is not the last interceptor in the chain)
      * @throws Exception wrapped from the intercepted instance. See CDI-115
      */
-    public Object intercept(InterceptionType type, T instance, InvocationContext ctx) throws Exception;
+    Object intercept(InterceptionType type, T instance, InvocationContext ctx) throws Exception;
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/PassivationCapable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/PassivationCapable.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/PassivationCapable.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/PassivationCapable.java Wed May 24 20:27:18 2017
@@ -20,5 +20,5 @@ package javax.enterprise.inject.spi;
 
 public interface PassivationCapable
 {
-    public String getId();
+    String getId();
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java Wed May 24 20:27:18 2017
@@ -32,18 +32,18 @@ public interface ProcessAnnotatedType<X>
      * 
      * @return annotated type
      */
-    public AnnotatedType<X> getAnnotatedType();
+    AnnotatedType<X> getAnnotatedType();
     
     /**
      * Replaces annotated type.
      * 
      * @param type annotated type
      */
-    public void setAnnotatedType(AnnotatedType<X> type);
+    void setAnnotatedType(AnnotatedType<X> type);
     
     /**
      * Veto registering process.
      */
-    public void veto();    
+    void veto();
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessBean.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessBean.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessBean.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessBean.java Wed May 24 20:27:18 2017
@@ -32,20 +32,20 @@ public interface ProcessBean<X>
      * 
      * @return annotated
      */
-    public Annotated getAnnotated();
+    Annotated getAnnotated();
     
     /**
      * Returns bean instance.
      * 
      * @return bean
      */
-    public Bean<X> getBean();
+    Bean<X> getBean();
 
     /**
      * Aborts processing.
      * 
      * @param t throwable
      */
-    public void addDefinitionError(Throwable t);
+    void addDefinitionError(Throwable t);
 
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessInjectionTarget.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessInjectionTarget.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessInjectionTarget.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessInjectionTarget.java Wed May 24 20:27:18 2017
@@ -33,21 +33,21 @@ public interface ProcessInjectionTarget<
      * 
      * @return annotated type
      */
-    public AnnotatedType<X> getAnnotatedType();
+    AnnotatedType<X> getAnnotatedType();
 
     /**
      * Returns injection target.
      * 
      * @return injection target
      */
-    public InjectionTarget<X> getInjectionTarget();
+    InjectionTarget<X> getInjectionTarget();
     
     /**
      * Replaces injection target.
      * 
      * @param injectionTarget new injection target
      */
-    public void setInjectionTarget(InjectionTarget<X> injectionTarget);
+    void setInjectionTarget(InjectionTarget<X> injectionTarget);
 
     /**
      * Adding definition error. Container aborts
@@ -55,7 +55,7 @@ public interface ProcessInjectionTarget<
      * 
      * @param t throwable
      */
-    public void addDefinitionError(Throwable t);
+    void addDefinitionError(Throwable t);
 
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessManagedBean.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessManagedBean.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessManagedBean.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessManagedBean.java Wed May 24 20:27:18 2017
@@ -32,5 +32,5 @@ public interface ProcessManagedBean<X> e
      * 
      * @return annotated type
      */
-    public AnnotatedType<X> getAnnotatedBeanClass();
+    AnnotatedType<X> getAnnotatedBeanClass();
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducer.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducer.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducer.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducer.java Wed May 24 20:27:18 2017
@@ -34,28 +34,28 @@ public interface ProcessProducer<X, T>
      * 
      * @return annotated member
      */
-    public AnnotatedMember<X> getAnnotatedMember();
+    AnnotatedMember<X> getAnnotatedMember();
     
     /**
      * Returns producer instance.
      * 
      * @return producer instance
      */
-    public Producer<T> getProducer();
+    Producer<T> getProducer();
     
     /**
      * Replaces producer instance.
      * 
      * @param producer new producer
      */
-    public void setProducer(Producer<T> producer);
+    void setProducer(Producer<T> producer);
 
     /**
      * Adding definition error. Container aborts processing.
      * 
      * @param t throwable
      */
-    public void addDefinitionError(Throwable t);
+    void addDefinitionError(Throwable t);
     
 
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java Wed May 24 20:27:18 2017
@@ -33,11 +33,11 @@ public interface ProcessProducerField<X,
      * 
      * @return annotated field.
      */
-    public AnnotatedField<X> getAnnotatedProducerField();
+    AnnotatedField<X> getAnnotatedProducerField();
 
     /**
      * @return the {@link javax.enterprise.inject.Disposes} annotated parameter of the disposal method
      *      which fits the producer field, or <code>null</code> if there is no disposal method.
      */
-    public AnnotatedParameter<X> getAnnotatedDisposedParameter();
+    AnnotatedParameter<X> getAnnotatedDisposedParameter();
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java Wed May 24 20:27:18 2017
@@ -33,13 +33,13 @@ public interface ProcessProducerMethod<X
      * 
      * @return annotated method
      */
-    public AnnotatedMethod<X> getAnnotatedProducerMethod();
+    AnnotatedMethod<X> getAnnotatedProducerMethod();
 
     /**
      * Returns annotated parameter.
      * @return the {@link javax.enterprise.inject.Disposes} annotated parameter of the disposal method
      *      which fits the producer field, or <code>null</code> if there is no disposal method.
      */
-    public AnnotatedParameter<X> getAnnotatedDisposedParameter();
+    AnnotatedParameter<X> getAnnotatedDisposedParameter();
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java Wed May 24 20:27:18 2017
@@ -32,13 +32,13 @@ public interface ProcessSessionBean<X> e
      * 
      * @return ejb name
      */
-    public String getEjbName();
+    String getEjbName();
     
     /**
      * Returns ejb type.
      * 
      * @return ejb type.
      */
-    public SessionBeanType getSessionBeanType();    
+    SessionBeanType getSessionBeanType();
 
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSyntheticAnnotatedType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSyntheticAnnotatedType.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSyntheticAnnotatedType.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSyntheticAnnotatedType.java Wed May 24 20:27:18 2017
@@ -27,5 +27,5 @@ public interface ProcessSyntheticAnnotat
     /**
      * @return the Extension which added this AnnotatedType
      */
-    public Extension getSource();
+    Extension getSource();
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Producer.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Producer.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Producer.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Producer.java Wed May 24 20:27:18 2017
@@ -38,7 +38,7 @@ public interface Producer<T>
      *
      * <ul>
      *
-     *     <li><b>Bean Class</b> : It calls the constructor annotated with {@link Initializer} if it
+     *     <li><b>Bean Class</b> : It calls the constructor annotated with {@link javax.inject.Inject} if it
      * exists, or the constructor with no parameters otherwise.</li>
      *
      *  <li><b>Producer Method or Field</b> : Calls the producer method on,
@@ -53,7 +53,7 @@ public interface Producer<T>
      *
      * @return an instance of bean
      */
-    public T produce(CreationalContext<T> creationalContext);
+    T produce(CreationalContext<T> creationalContext);
 
     /**
      * Its result depends on bean type.
@@ -66,7 +66,7 @@ public interface Producer<T>
      *
      * @param instance dispose istance
      */
-    public void dispose(T instance);
+    void dispose(T instance);
 
     /**
      * Its result depends on bean type.
@@ -86,7 +86,7 @@ public interface Producer<T>
      *
      * @return set of injection points
      */
-    public Set<InjectionPoint> getInjectionPoints();
+    Set<InjectionPoint> getInjectionPoints();
 
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProducerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProducerFactory.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProducerFactory.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/ProducerFactory.java Wed May 24 20:27:18 2017
@@ -28,6 +28,6 @@ public interface ProducerFactory<X>
      * Creates a Producer for the given Bean
      * @param bean the Bean or <code>null</code> if the Producer should not get managed by the container.
      */
-    public <T> Producer<T> createProducer(Bean<T> bean);
+    <T> Producer<T> createProducer(Bean<T> bean);
 
 }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Unmanaged.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Unmanaged.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Unmanaged.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/inject/spi/Unmanaged.java Wed May 24 20:27:18 2017
@@ -63,7 +63,7 @@ public class Unmanaged<T>
 
     public UnmanagedInstance<T> newInstance()
     {
-        return new UnmanagedInstance<T>(beanManager, injectionTarget);
+        return new UnmanagedInstance<>(beanManager, injectionTarget);
     }
 
 

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=1796096&r1=1796095&r2=1796096&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 Wed May 24 20:27:18 2017
@@ -63,7 +63,7 @@ public abstract class AnnotationLiteral<
     {
         Type superClazz = definedClazz.getGenericSuperclass();
         
-        Class<T> clazz = null;
+        Class<T> clazz;
         
         if (superClazz.equals(Object.class))
         {
@@ -344,11 +344,7 @@ public abstract class AnnotationLiteral<
         if (_meths == null) {
             // no need to have meths volatile nor synchronized.
             // if invoked in parallel we only might call getMethods() a bit too often.
-            _meths = (Method[]) AccessController.doPrivileged(new PrivilegedAction() {
-                public Object run() {
-                    return annotationType.getDeclaredMethods();
-                }
-            });
+            _meths = (Method[]) AccessController.doPrivileged((PrivilegedAction) () -> annotationType.getDeclaredMethods());
         }
         return _meths;
     }

Modified: geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/TypeLiteral.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/TypeLiteral.java?rev=1796096&r1=1796095&r2=1796096&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/TypeLiteral.java (original)
+++ geronimo/specs/trunk/geronimo-jcdi_2.0_spec/src/main/java/javax/enterprise/util/TypeLiteral.java Wed May 24 20:27:18 2017
@@ -48,7 +48,7 @@ public abstract class TypeLiteral<T> imp
 
     public final Class<T> getRawType()
     {
-        Class<T> rawType = null;
+        Class<T> rawType;
 
         if (this.definedType instanceof Class)
         {
@@ -74,7 +74,7 @@ public abstract class TypeLiteral<T> imp
 
     private Type getDefinedType(Class<?> clazz)
     {
-        Type type = null;
+        Type type;
 
         if (clazz == null)
         {