You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2012/06/12 11:48:10 UTC

[2/5] DELTASPIKE-102 sonar - remove unnecessary 'this'

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/ImmutableBeanWrapper.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/ImmutableBeanWrapper.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/ImmutableBeanWrapper.java
index a91bd06..16347d0 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/ImmutableBeanWrapper.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/ImmutableBeanWrapper.java
@@ -107,7 +107,7 @@ class ImmutableBeanWrapper<T> extends AbstractImmutableBean<T>
         super(bean.getBeanClass(), name, qualifiers, scope, stereotypes,
             types, alternative, nullable, bean.getInjectionPoints(), toString);
 
-        this.wrapped = bean;
+        wrapped = bean;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
index 0c6badd..8b18eb4 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
@@ -58,7 +58,7 @@ public class MessageBundleExtension implements Extension, Deactivatable
     @SuppressWarnings("UnusedDeclaration")
     protected void detectInterfaces(@Observes ProcessAnnotatedType<?> event)
     {
-        if (!this.isActivated)
+        if (!isActivated)
         {
             return;
         }
@@ -122,7 +122,7 @@ public class MessageBundleExtension implements Extension, Deactivatable
     @SuppressWarnings("UnusedDeclaration")
     protected void detectProducers(@Observes ProcessProducerMethod<Object, TypedMessageBundleProducer> event)
     {
-        if (!this.isActivated)
+        if (!isActivated)
         {
             return;
         }
@@ -136,7 +136,7 @@ public class MessageBundleExtension implements Extension, Deactivatable
     @SuppressWarnings("UnusedDeclaration")
     protected void detectProducersInverted(@Observes ProcessProducerMethod<TypedMessageBundleProducer, Object> event)
     {
-        if (!this.isActivated)
+        if (!isActivated)
         {
             return;
         }
@@ -149,7 +149,7 @@ public class MessageBundleExtension implements Extension, Deactivatable
     {
         if (method.isAnnotationPresent(TypedMessageBundle.class))
         {
-            this.bundleProducerBean = (Bean<Object>) bean;
+            bundleProducerBean = (Bean<Object>) bean;
         }
     }
 
@@ -176,7 +176,7 @@ public class MessageBundleExtension implements Extension, Deactivatable
     @SuppressWarnings("UnusedDeclaration")
     protected void cleanup(@Observes AfterDeploymentValidation event)
     {
-        this.messageBundleTypes.clear();
+        messageBundleTypes.clear();
     }
 
     protected void initActivation()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/NarrowingBeanBuilder.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/NarrowingBeanBuilder.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/NarrowingBeanBuilder.java
index a38e18f..0cefe34 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/NarrowingBeanBuilder.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/NarrowingBeanBuilder.java
@@ -75,9 +75,9 @@ class NarrowingBeanBuilder<T>
      */
     public NarrowingBeanBuilder<T> readFromType(AnnotatedType<T> type)
     {
-        this.types = new HashSet<Type>(type.getTypeClosure());
-        this.qualifiers = new HashSet<Annotation>();
-        this.stereotypes = new HashSet<Class<? extends Annotation>>();
+        types = new HashSet<Type>(type.getTypeClosure());
+        qualifiers = new HashSet<Annotation>();
+        stereotypes = new HashSet<Class<? extends Annotation>>();
         String name = null;
         Class<? extends Annotation> scope = Dependent.class;
 
@@ -85,7 +85,7 @@ class NarrowingBeanBuilder<T>
         {
             if (beanManager.isQualifier(annotation.annotationType()))
             {
-                this.qualifiers.add(annotation);
+                qualifiers.add(annotation);
             }
             else if (annotation.annotationType().equals(Named.class))
             {
@@ -97,17 +97,17 @@ class NarrowingBeanBuilder<T>
             }
             else if (beanManager.isStereotype(annotation.annotationType()))
             {
-                this.stereotypes.add(annotation.annotationType());
+                stereotypes.add(annotation.annotationType());
             }
         }
         if (qualifiers.isEmpty())
         {
-            this.qualifiers.add(new DefaultLiteral());
+            qualifiers.add(new DefaultLiteral());
         }
-        this.qualifiers.add(new AnyLiteral());
+        qualifiers.add(new AnyLiteral());
         this.name = "".equals(name) ? null : name;
         this.scope = scope;
-        this.alternative = type.isAnnotationPresent(Alternative.class);
+        alternative = type.isAnnotationPresent(Alternative.class);
         return this;
     }
 
@@ -150,7 +150,7 @@ class NarrowingBeanBuilder<T>
      */
     public NarrowingBeanBuilder<T> addType(Type type)
     {
-        this.types.add(type);
+        types.add(type);
         return this;
     }
 
@@ -215,7 +215,7 @@ class NarrowingBeanBuilder<T>
      */
     public NarrowingBeanBuilder<T> addQualifier(Annotation qualifier)
     {
-        this.qualifiers.add(qualifier);
+        qualifiers.add(qualifier);
         return this;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/UnmodifiableMessageContextConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/UnmodifiableMessageContextConfig.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/UnmodifiableMessageContextConfig.java
index f224da0..e776c6b 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/UnmodifiableMessageContextConfig.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/UnmodifiableMessageContextConfig.java
@@ -42,7 +42,7 @@ class UnmodifiableMessageContextConfig implements MessageContext.Config
     public MessageContextBuilder use()
     {
         //it's ok to delegate - the call of #use creates a new instance of the context - the old context is untouched
-        return this.messageContextConfig.use();
+        return messageContextConfig.use();
     }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
index 371ad36..abb9430 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/global/GlobalAlternativeTest.java
@@ -97,13 +97,13 @@ public class GlobalAlternativeTest
     @Test
     public void alternativeImplementationWithInterfaceAsBaseType()
     {
-        Assert.assertEquals(BaseInterface1AlternativeImplementation.class.getName(), this.bean.getClass().getName());
+        Assert.assertEquals(BaseInterface1AlternativeImplementation.class.getName(), bean.getClass().getName());
     }
 
     @Test
     public void alternativeImplementationWithInterfaceAsBaseTypeAndQualifier()
     {
-        Assert.assertEquals(BaseBeanA.class.getName(), this.beanA.getClass().getName());
-        Assert.assertEquals(AlternativeBaseBeanB.class.getName(), this.beanB.getClass().getName());
+        Assert.assertEquals(BaseBeanA.class.getName(), beanA.getClass().getName());
+        Assert.assertEquals(AlternativeBaseBeanB.class.getName(), beanB.getClass().getName());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
index 0bdc333..2e6bd90 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/alternative/local/BdaAlternativeTest.java
@@ -81,6 +81,6 @@ public class BdaAlternativeTest
     @Test
     public void alternativeImplementationWithInterfaceAsBaseType()
     {
-        Assert.assertEquals(BaseInterface2DefaultImplementation.class.getName(), this.bean.getClass().getName());
+        Assert.assertEquals(BaseInterface2DefaultImplementation.class.getName(), bean.getClass().getName());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
index a47fb3e..4f910cf 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/injectable/SettingsBean.java
@@ -51,7 +51,7 @@ public class SettingsBean
     @Inject
     protected void init(@CustomConfigAnnotationWithMetaData(inverseConvert = true) Long inverseProperty)
     {
-        this.inverseProperty2 = inverseProperty;
+        inverseProperty2 = inverseProperty;
     }
 
     int getProperty1()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
index a2c5d4e..24a52e4 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageContextTest.java
@@ -76,7 +76,7 @@ public class MessageContextTest
     public void testSimpleMessage()
     {
         assertEquals("Welcome to DeltaSpike",
-                this.simpleMessage.welcomeTo(this.messageContext, "DeltaSpike").toString());
+                simpleMessage.welcomeTo(messageContext, "DeltaSpike").toString());
     }
 
     @Test
@@ -84,7 +84,7 @@ public class MessageContextTest
     {
         LocaleResolver localeResolver = new TestLocalResolver();
 
-        String messageText = this.messageContext.config()
+        String messageText = messageContext.config()
                 .use()
                     .localeResolver(localeResolver)
                     .messageResolver(new TestMessageResolver(localeResolver))
@@ -97,7 +97,7 @@ public class MessageContextTest
     public void resolveGermanMessageTextTest()
     {
         LocaleResolver localeResolver = new TestGermanLocaleResolver();
-        String messageText = this.messageContext.config()
+        String messageText = messageContext.config()
                 .use()
                     .localeResolver(localeResolver)
                     .messageResolver(new TestMessageResolver(localeResolver))
@@ -109,7 +109,7 @@ public class MessageContextTest
     @Test
     public void createInvalidMessageTest()
     {
-        String messageText = this.messageContext.message().text("{xyz123}").toText();
+        String messageText = messageContext.message().text("{xyz123}").toText();
 
         assertEquals("???xyz123???", messageText);
     }
@@ -117,7 +117,7 @@ public class MessageContextTest
     @Test
     public void createInvalidMessageWithArgumentsTest()
     {
-        String messageText = this.messageContext.message().text("{xyz123}").argument("123").argument("456").argument("789").toText();
+        String messageText = messageContext.message().text("{xyz123}").argument("123").argument("456").argument("789").toText();
 
         assertEquals("???xyz123??? (123,456,789)", messageText);
     }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
index 604020f..85777b6 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/MessageTest.java
@@ -76,12 +76,12 @@ public class MessageTest
     @Test
     public void testInternationalizedMessage()
     {
-        assertEquals("Welcome to DeltaSpike", this.messages.welcomeToDeltaSpike());
+        assertEquals("Welcome to DeltaSpike", messages.welcomeToDeltaSpike());
     }
 
     @Test
     public void testInternationalizedParametrizedMessage()
     {
-        assertEquals("Welcome to Apache DeltaSpike", this.messages.welcomeTo("Apache DeltaSpike"));
+        assertEquals("Welcome to Apache DeltaSpike", messages.welcomeTo("Apache DeltaSpike"));
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java
index 033a6cc..b258075 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/SimpleMessageTest.java
@@ -70,6 +70,6 @@ public class SimpleMessageTest
     @Test
     public void testSimpleMessage()
     {
-        assertEquals("Welcome to DeltaSpike", this.simpleMessage.welcomeToDeltaSpike());
+        assertEquals("Welcome to DeltaSpike", simpleMessage.welcomeToDeltaSpike());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java
index 40fb4ed..6582c08 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java
@@ -53,19 +53,19 @@ public class TestMessageResolver implements MessageResolver
             resolvedBundle = null;
         }
 
-        this.messageBundle = resolvedBundle;
+        messageBundle = resolvedBundle;
     }
 
     @Override
     public String getMessage(String messageTemplate)
     {
-        if (this.messageBundle != null && messageTemplate != null &&
+        if (messageBundle != null && messageTemplate != null &&
                 messageTemplate.startsWith("{") && messageTemplate.endsWith("}"))
         {
             messageTemplate = messageTemplate.substring(1, messageTemplate.length() - 1);
             try
             {
-                return this.messageBundle.getString(messageTemplate);
+                return messageBundle.getString(messageTemplate);
             }
             catch (MissingResourceException e)
             {

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventTest.java
index 9143fb9..25e85a3 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/event/EventTest.java
@@ -72,24 +72,24 @@ public class EventTest
     @Test
     public void assertEventWithQualifiersIsCreatedCorrectly()
     {
-        this.bm.fireEvent(new ExceptionToCatchEvent(new NullPointerException(), new EventQualifierLiteral()));
+        bm.fireEvent(new ExceptionToCatchEvent(new NullPointerException(), new EventQualifierLiteral()));
     }
 
     public void verifyDescEvent(@BeforeHandles IntrospectiveExceptionEvent<NullPointerException> event)
     {
-        this.qualiferCalledCount++;
+        qualiferCalledCount++;
         assertTrue(event.isBeforeTraversal());
     }
 
     public void verifyAscEvent(@Handles IntrospectiveExceptionEvent<NullPointerException> event)
     {
-        this.qualiferCalledCount++;
+        qualiferCalledCount++;
         assertFalse(event.isBeforeTraversal());
     }
 
     public void verifyQualifierEvent(@Handles @EventQualifier ExceptionEvent<NullPointerException> event)
     {
-        this.qualiferCalledCount++;
-        assertThat(this.qualiferCalledCount, is(1));
+        qualiferCalledCount++;
+        assertThat(qualiferCalledCount, is(1));
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/BreadthFirstAbortControlTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/BreadthFirstAbortControlTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/BreadthFirstAbortControlTest.java
index 77c0298..fe942aa 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/BreadthFirstAbortControlTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/BreadthFirstAbortControlTest.java
@@ -59,7 +59,7 @@ public class BreadthFirstAbortControlTest
     public void assertNoOtherHandlersCalledAfterAbort()
     {
         bm.fireEvent(new ExceptionToCatchEvent(new NullPointerException()));
-        assertTrue(this.abortingBreadthFirstHandler.isAbortCalled());
-        assertFalse(this.abortingBreadthFirstHandler.isProceedCalled());
+        assertTrue(abortingBreadthFirstHandler.isAbortCalled());
+        assertFalse(abortingBreadthFirstHandler.isProceedCalled());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/DepthAbortControlTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/DepthAbortControlTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/DepthAbortControlTest.java
index de7a0e3..7151c95 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/DepthAbortControlTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/DepthAbortControlTest.java
@@ -59,7 +59,7 @@ public class DepthAbortControlTest
     public void assertNoOtherHandlersCalledAfterAbort()
     {
         bm.fireEvent(new ExceptionToCatchEvent(new NullPointerException()));
-        assertTrue(this.abortingDepthHandler.isAbortCalled());
-        assertFalse(this.abortingDepthHandler.isProceedCalled());
+        assertTrue(abortingDepthHandler.isAbortCalled());
+        assertFalse(abortingDepthHandler.isProceedCalled());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/HandledExceptionHandlerTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/HandledExceptionHandlerTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/HandledExceptionHandlerTest.java
index 5b1e3f8..81d68b1 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/HandledExceptionHandlerTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/HandledExceptionHandlerTest.java
@@ -61,8 +61,8 @@ public class HandledExceptionHandlerTest
         final ExceptionToCatchEvent entryEvent = new ExceptionToCatchEvent(new Exception(
                 new NullPointerException()));
         bm.fireEvent(entryEvent);
-        assertTrue(this.exceptionHandledHandler.isNpeDescCalled());
-        assertFalse(this.exceptionHandledHandler.isExAscCalled());
+        assertTrue(exceptionHandledHandler.isNpeDescCalled());
+        assertFalse(exceptionHandledHandler.isExAscCalled());
         assertTrue(entryEvent.isHandled());
     }
 
@@ -71,8 +71,8 @@ public class HandledExceptionHandlerTest
     {
         final ExceptionToCatchEvent event = new ExceptionToCatchEvent(new Exception(new IllegalArgumentException()));
         bm.fireEvent(event);
-        assertTrue(this.exceptionHandledHandler.isIaeAscCalled());
-        assertFalse(this.exceptionHandledHandler.isExAscCalled());
+        assertTrue(exceptionHandledHandler.isIaeAscCalled());
+        assertFalse(exceptionHandledHandler.isExAscCalled());
         assertTrue(event.isHandled());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandlerTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandlerTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandlerTest.java
index 802b7aa..1b120a6 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandlerTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/flow/ProceedCauseHandlerTest.java
@@ -58,10 +58,10 @@ public class ProceedCauseHandlerTest
     public void assertCorrectNumberOfHandlerCallsForProceedCause()
     {
         bm.fireEvent(new ExceptionToCatchEvent(new Exception(new IllegalArgumentException(new NullPointerException()))));
-        assertEquals(0, this.proceedCauseHandler.getBreadthFirstNpeLowerPrecedenceCalled());
-        assertEquals(1, this.proceedCauseHandler.getBreadthFirstNpeCalled());
+        assertEquals(0, proceedCauseHandler.getBreadthFirstNpeLowerPrecedenceCalled());
+        assertEquals(1, proceedCauseHandler.getBreadthFirstNpeCalled());
 
-        assertEquals(0, this.proceedCauseHandler.getDepthFirstNpeHigherPrecedenceCalled());
-        assertEquals(0, this.proceedCauseHandler.getDepthFirstNpeCalled());
+        assertEquals(0, proceedCauseHandler.getDepthFirstNpeHigherPrecedenceCalled());
+        assertEquals(0, proceedCauseHandler.getDepthFirstNpeCalled());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CallingHandlersTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CallingHandlersTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CallingHandlersTest.java
index e4ced43..2f7ea2c 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CallingHandlersTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/CallingHandlersTest.java
@@ -61,43 +61,43 @@ public class CallingHandlersTest
     {
         bm.fireEvent(new ExceptionToCatchEvent(new IllegalArgumentException()));
 
-        assertTrue(this.calledExceptionHandler.isOutboundHandlerCalled());
+        assertTrue(calledExceptionHandler.isOutboundHandlerCalled());
     }
 
     @Test
     public void assertOutboundHanldersAreCalledOnce()
     {
-        this.calledExceptionHandler.setOutboundHandlerTimesCalled(0);
+        calledExceptionHandler.setOutboundHandlerTimesCalled(0);
         bm.fireEvent(new ExceptionToCatchEvent(new IllegalArgumentException()));
-        assertEquals(1, this.calledExceptionHandler.getOutboundHandlerTimesCalled());
+        assertEquals(1, calledExceptionHandler.getOutboundHandlerTimesCalled());
     }
 
     @Test
     public void assertInboundHanldersAreCalledOnce()
     {
-        this.calledExceptionHandler.setInboundHandlerTimesCalled(0);
+        calledExceptionHandler.setInboundHandlerTimesCalled(0);
         bm.fireEvent(new ExceptionToCatchEvent(new IllegalArgumentException()));
-        assertEquals(1, this.calledExceptionHandler.getInboundHandlerTimesCalled());
+        assertEquals(1, calledExceptionHandler.getInboundHandlerTimesCalled());
     }
 
     @Test
     public void assertAdditionalParamsAreInjected()
     {
         bm.fireEvent(new ExceptionToCatchEvent(new RuntimeException(new IllegalArgumentException())));
-        assertTrue(this.calledExceptionHandler.isBeanmanagerInjected());
+        assertTrue(calledExceptionHandler.isBeanmanagerInjected());
     }
 
     //@Test //TODO discuss this test
     public void assertAdditionalParamsAreInjectedWithDifferentHandlerLocation()
     {
         bm.fireEvent(new ExceptionToCatchEvent(new SQLException()));
-        assertTrue(this.calledExceptionHandler.isLocationDifferBeanmanagerInjected());
+        assertTrue(calledExceptionHandler.isLocationDifferBeanmanagerInjected());
     }
 
     @Test
     public void assertProtectedHandlersAreCalled()
     {
         bm.fireEvent(new ExceptionToCatchEvent(new IllegalStateException()));
-        assertTrue(this.calledExceptionHandler.isProtectedHandlerCalled());
+        assertTrue(calledExceptionHandler.isProtectedHandlerCalled());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandlerTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandlerTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandlerTest.java
index 4b29dc1..0f1045f 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandlerTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/exception/control/handler/UnMuteHandlerTest.java
@@ -59,7 +59,7 @@ public class UnMuteHandlerTest
     {
         bm.fireEvent(new ExceptionToCatchEvent(new Exception(new NullPointerException())));
 
-        assertEquals(2, this.unMuteHandler.getDepthFirstNumberCalled());
-        assertEquals(2, this.unMuteHandler.getBreadthFirstNumberCalled());
+        assertEquals(2, unMuteHandler.getDepthFirstNumberCalled());
+        assertEquals(2, unMuteHandler.getBreadthFirstNumberCalled());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptor.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptor.java b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptor.java
index a7eec08..92fc25a 100644
--- a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptor.java
+++ b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionalInterceptor.java
@@ -54,6 +54,6 @@ public class TransactionalInterceptor implements Serializable
     @AroundInvoke
     public Object executeInTransaction(InvocationContext invocationContext) throws Exception
     {
-        return this.persistenceStrategy.execute(invocationContext);
+        return persistenceStrategy.execute(invocationContext);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java
index f23e89c..face0a8 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java
@@ -90,7 +90,7 @@ public class TestEntityManager implements EntityManager
     @Override
     public void flush()
     {
-        this.flushed = true;
+        flushed = true;
     }
 
     @Override
@@ -246,23 +246,23 @@ public class TestEntityManager implements EntityManager
     @Override
     public void close()
     {
-        if (!this.open)
+        if (!open)
         {
             throw new IllegalStateException("entity manager is closed already");
         }
-        this.open = false;
+        open = false;
     }
 
     @Override
     public boolean isOpen()
     {
-        return this.open;
+        return open;
     }
 
     @Override
     public EntityTransaction getTransaction()
     {
-        return this.entityTransaction;
+        return entityTransaction;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityTransaction.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityTransaction.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityTransaction.java
index 79cafb8..056fb0c 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityTransaction.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityTransaction.java
@@ -29,24 +29,24 @@ public class TestEntityTransaction implements EntityTransaction
     @Override
     public void begin()
     {
-        if (this.started)
+        if (started)
         {
             throw new IllegalStateException("transaction started already");
         }
 
-        this.started = true;
+        started = true;
     }
 
     @Override
     public void commit()
     {
-        this.committed = true;
+        committed = true;
     }
 
     @Override
     public void rollback()
     {
-        this.rolledBack = true;
+        rolledBack = true;
     }
 
     @Override
@@ -64,7 +64,7 @@ public class TestEntityTransaction implements EntityTransaction
     @Override
     public boolean isActive()
     {
-        return this.started && !(this.committed || this.rolledBack);
+        return started && !(committed || rolledBack);
     }
 
     public boolean isStarted()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/DefaultEntityManagerInjectionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/DefaultEntityManagerInjectionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/DefaultEntityManagerInjectionTest.java
index 9046517..6619dbc 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/DefaultEntityManagerInjectionTest.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/DefaultEntityManagerInjectionTest.java
@@ -80,7 +80,7 @@ public class DefaultEntityManagerInjectionTest
     @Test
     public void defaultEntityManagerInjection()
     {
-        EntityManager injectedEntityManager = this.entityManagerProducer.getDefaultEntityManager();
+        EntityManager injectedEntityManager = entityManagerProducer.getDefaultEntityManager();
 
         Assert.assertNotNull(injectedEntityManager);
         Assert.assertTrue(injectedEntityManager instanceof TestEntityManager);
@@ -92,7 +92,7 @@ public class DefaultEntityManagerInjectionTest
         Assert.assertEquals(false, testTransaction.isCommitted());
         Assert.assertEquals(false, testTransaction.isRolledBack());
 
-        this.transactionalBean.executeInTransaction();
+        transactionalBean.executeInTransaction();
 
         Assert.assertEquals(true, ((TestEntityManager) injectedEntityManager).isFlushed());
         Assert.assertEquals(false, testTransaction.isActive());
@@ -104,7 +104,7 @@ public class DefaultEntityManagerInjectionTest
     @Test
     public void defaultEntityManagerInjectionFailedTransaction()
     {
-        EntityManager injectedEntityManager = this.entityManagerProducer.getDefaultEntityManager();
+        EntityManager injectedEntityManager = entityManagerProducer.getDefaultEntityManager();
 
         Assert.assertNotNull(injectedEntityManager);
         Assert.assertTrue(injectedEntityManager instanceof TestEntityManager);
@@ -118,7 +118,7 @@ public class DefaultEntityManagerInjectionTest
 
         try
         {
-            this.failedTransactionalBean.executeInTransaction();
+            failedTransactionalBean.executeInTransaction();
             Assert.fail(TestException.class.getName() + " expected!");
         }
         catch (TestException e)
@@ -136,7 +136,7 @@ public class DefaultEntityManagerInjectionTest
     @Test
     public void defaultEntityManagerInjectionFailedFlush()
     {
-        EntityManager injectedEntityManager = this.entityManagerProducer.getFailedFlushEntityManager();
+        EntityManager injectedEntityManager = entityManagerProducer.getFailedFlushEntityManager();
 
         Assert.assertNotNull(injectedEntityManager);
         Assert.assertTrue(injectedEntityManager instanceof TestEntityManager);
@@ -150,7 +150,7 @@ public class DefaultEntityManagerInjectionTest
 
         try
         {
-            this.failedFlushTransactionalBean.executeInTransaction();
+            failedFlushTransactionalBean.executeInTransaction();
             Assert.fail(TestException.class.getName() + " expected!");
         }
         catch (TestException e)

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/TestEntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/TestEntityManagerProducer.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/TestEntityManagerProducer.java
index 8d15805..5907c81 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/TestEntityManagerProducer.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/TestEntityManagerProducer.java
@@ -40,14 +40,14 @@ public class TestEntityManagerProducer
     @Produces
     protected EntityManager defaultEntityManager()
     {
-        return this.defaultEntityManager;
+        return defaultEntityManager;
     }
 
     @Produces
     @Failed
     protected EntityManager failedFlushEntityManager()
     {
-        return this.failedFlushEntityManager;
+        return failedFlushEntityManager;
     }
 
     public TestEntityManager getDefaultEntityManager()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/DefaultNestedTransactionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/DefaultNestedTransactionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/DefaultNestedTransactionTest.java
index 6c2cadb..2a8897d 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/DefaultNestedTransactionTest.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/DefaultNestedTransactionTest.java
@@ -71,7 +71,7 @@ public class DefaultNestedTransactionTest
     @Test
     public void defaultNestedTransaction()
     {
-        TestEntityManager firstEntityManager = this.entityManagerProducer.getFirstEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
 
         Assert.assertNotNull(firstEntityManager);
         TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
@@ -82,7 +82,7 @@ public class DefaultNestedTransactionTest
         Assert.assertEquals(false, firstTransaction.isCommitted());
         Assert.assertEquals(false, firstTransaction.isRolledBack());
 
-        this.firstLevelTransactionBean.executeInTransaction();
+        firstLevelTransactionBean.executeInTransaction();
 
         Assert.assertEquals(true, firstEntityManager.isFlushed());
         Assert.assertEquals(false, firstTransaction.isActive());

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/FirstLevelTransactionBean.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/FirstLevelTransactionBean.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/FirstLevelTransactionBean.java
index 7d74128..7647ea9 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/FirstLevelTransactionBean.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/FirstLevelTransactionBean.java
@@ -36,6 +36,6 @@ public class FirstLevelTransactionBean
     @Transactional
     public void executeInTransaction()
     {
-        this.nestedTransactionBean.executeInTransaction();
+        nestedTransactionBean.executeInTransaction();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/TestEntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/TestEntityManagerProducer.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/TestEntityManagerProducer.java
index f89ad34..784ed9b 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/TestEntityManagerProducer.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultnested/TestEntityManagerProducer.java
@@ -32,7 +32,7 @@ public class TestEntityManagerProducer
     @Produces
     protected EntityManager firstEntityManager()
     {
-        return this.firstEntityManager;
+        return firstEntityManager;
     }
 
     public TestEntityManager getFirstEntityManager()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/FirstLevelTransactionBean.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/FirstLevelTransactionBean.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/FirstLevelTransactionBean.java
index ccc7cb0..bd6974c 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/FirstLevelTransactionBean.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/FirstLevelTransactionBean.java
@@ -40,7 +40,7 @@ public class FirstLevelTransactionBean
     {
         try
         {
-            this.nestedTransactionBean.executeInTransaction();
+            nestedTransactionBean.executeInTransaction();
         }
         catch (TestException e)
         {

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/NestedMultiTransactionCatchedExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/NestedMultiTransactionCatchedExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/NestedMultiTransactionCatchedExceptionTest.java
index 0f81cdd..c659825 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/NestedMultiTransactionCatchedExceptionTest.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/NestedMultiTransactionCatchedExceptionTest.java
@@ -71,8 +71,8 @@ public class NestedMultiTransactionCatchedExceptionTest
     @Test
     public void nestedMultiTransactionCatchedExceptionTest()
     {
-        TestEntityManager firstEntityManager = this.entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = this.entityManagerProducer.getSecondEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
+        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
 
         Assert.assertNotNull(firstEntityManager);
         TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
@@ -92,7 +92,7 @@ public class NestedMultiTransactionCatchedExceptionTest
         Assert.assertEquals(false, secondTransaction.isCommitted());
         Assert.assertEquals(false, secondTransaction.isRolledBack());
 
-        this.firstLevelTransactionBean.executeInTransaction();
+        firstLevelTransactionBean.executeInTransaction();
 
         Assert.assertEquals(true, firstEntityManager.isFlushed());
         Assert.assertEquals(false, firstTransaction.isActive());

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/TestEntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/TestEntityManagerProducer.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/TestEntityManagerProducer.java
index 81ed6db..aa6bbd4 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/TestEntityManagerProducer.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/multipleinjection/nested/TestEntityManagerProducer.java
@@ -37,14 +37,14 @@ public class TestEntityManagerProducer
     @First
     protected EntityManager firstEntityManager()
     {
-        return this.firstEntityManager;
+        return firstEntityManager;
     }
 
     @Produces
     @Second
     protected EntityManager secondEntityManager()
     {
-        return this.secondEntityManager;
+        return secondEntityManager;
     }
 
     public TestEntityManager getFirstEntityManager()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/FirstLevelTransactionBean.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/FirstLevelTransactionBean.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/FirstLevelTransactionBean.java
index 4410998..546b007 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/FirstLevelTransactionBean.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/FirstLevelTransactionBean.java
@@ -40,7 +40,7 @@ public class FirstLevelTransactionBean
     {
         try
         {
-            this.nestedTransactionBean.executeInTransaction();
+            nestedTransactionBean.executeInTransaction();
         }
         catch (TestException e)
         {

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/NestedTransactionCatchedExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/NestedTransactionCatchedExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/NestedTransactionCatchedExceptionTest.java
index 81f5a0a..442cb5c 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/NestedTransactionCatchedExceptionTest.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/NestedTransactionCatchedExceptionTest.java
@@ -71,7 +71,7 @@ public class NestedTransactionCatchedExceptionTest
     @Test
     public void nestedTransactionCatchedExceptionTest()
     {
-        TestEntityManager firstEntityManager = this.entityManagerProducer.getFirstEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
 
         Assert.assertNotNull(firstEntityManager);
         TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
@@ -82,7 +82,7 @@ public class NestedTransactionCatchedExceptionTest
         Assert.assertEquals(false, firstTransaction.isCommitted());
         Assert.assertEquals(false, firstTransaction.isRolledBack());
 
-        this.firstLevelTransactionBean.executeInTransaction();
+        firstLevelTransactionBean.executeInTransaction();
 
         Assert.assertEquals(true, firstEntityManager.isFlushed());
         Assert.assertEquals(false, firstTransaction.isActive());

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/TestEntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/TestEntityManagerProducer.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/TestEntityManagerProducer.java
index 02ea9b8..100848d 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/TestEntityManagerProducer.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/catched/nested/TestEntityManagerProducer.java
@@ -34,7 +34,7 @@ public class TestEntityManagerProducer
     @First
     protected EntityManager firstEntityManager()
     {
-        return this.firstEntityManager;
+        return firstEntityManager;
     }
 
     public TestEntityManager getFirstEntityManager()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/MultipleEntityManagerInjectionUncatchedExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/MultipleEntityManagerInjectionUncatchedExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/MultipleEntityManagerInjectionUncatchedExceptionTest.java
index 7bc3f10..c63533c 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/MultipleEntityManagerInjectionUncatchedExceptionTest.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/MultipleEntityManagerInjectionUncatchedExceptionTest.java
@@ -72,9 +72,9 @@ public class MultipleEntityManagerInjectionUncatchedExceptionTest
     @Test
     public void autoInjectionUncatchedExceptionTest()
     {
-        TestEntityManager defaultEntityManager = this.entityManagerProducer.getDefaultEntityManager();
-        TestEntityManager firstEntityManager = this.entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = this.entityManagerProducer.getSecondEntityManager();
+        TestEntityManager defaultEntityManager = entityManagerProducer.getDefaultEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
+        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
 
         Assert.assertNotNull(defaultEntityManager);
         TestEntityTransaction defaultTransaction = (TestEntityTransaction) (defaultEntityManager).getTransaction();
@@ -105,7 +105,7 @@ public class MultipleEntityManagerInjectionUncatchedExceptionTest
 
         try
         {
-            this.multiTransactionBean.executeInTransaction();
+            multiTransactionBean.executeInTransaction();
             Assert.fail(TestException.class.getName() + " expected!");
         }
         catch (TestException e)

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/TestEntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/TestEntityManagerProducer.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/TestEntityManagerProducer.java
index b933f46..cbcd3ab 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/TestEntityManagerProducer.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/TestEntityManagerProducer.java
@@ -38,21 +38,21 @@ public class TestEntityManagerProducer
     @Produces
     protected EntityManager defaultEntityManager()
     {
-        return this.defaultEntityManager;
+        return defaultEntityManager;
     }
 
     @Produces
     @First
     protected EntityManager firstEntityManager()
     {
-        return this.firstEntityManager;
+        return firstEntityManager;
     }
 
     @Produces
     @Second
     protected EntityManager secondEntityManager()
     {
-        return this.secondEntityManager;
+        return secondEntityManager;
     }
 
     public TestEntityManager getDefaultEntityManager()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/MultipleEntityManagerInjectionUncatchedFlushExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/MultipleEntityManagerInjectionUncatchedFlushExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/MultipleEntityManagerInjectionUncatchedFlushExceptionTest.java
index 25dae0e..4a1f07a 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/MultipleEntityManagerInjectionUncatchedFlushExceptionTest.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/MultipleEntityManagerInjectionUncatchedFlushExceptionTest.java
@@ -72,9 +72,9 @@ public class MultipleEntityManagerInjectionUncatchedFlushExceptionTest
     @Test
     public void autoInjectionUncatchedFlushExceptionTest()
     {
-        TestEntityManager defaultEntityManager = this.entityManagerProducer.getDefaultEntityManager();
-        TestEntityManager firstEntityManager = this.entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = this.entityManagerProducer.getSecondEntityManager();
+        TestEntityManager defaultEntityManager = entityManagerProducer.getDefaultEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
+        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
 
         Assert.assertNotNull(defaultEntityManager);
         TestEntityTransaction defaultTransaction = (TestEntityTransaction) (defaultEntityManager).getTransaction();
@@ -105,7 +105,7 @@ public class MultipleEntityManagerInjectionUncatchedFlushExceptionTest
 
         try
         {
-            this.multiTransactionBean.executeInTransaction();
+            multiTransactionBean.executeInTransaction();
             Assert.fail(TestException.class.getName() + " expected!");
         }
         catch (TestException e)

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/TestEntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/TestEntityManagerProducer.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/TestEntityManagerProducer.java
index 9cb9bae..66b1eaa 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/TestEntityManagerProducer.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/TestEntityManagerProducer.java
@@ -57,21 +57,21 @@ public class TestEntityManagerProducer
     @Produces
     protected EntityManager defaultEntityManager()
     {
-        return this.defaultEntityManager;
+        return defaultEntityManager;
     }
 
     @Produces
     @First
     protected EntityManager firstEntityManager()
     {
-        return this.firstEntityManager;
+        return firstEntityManager;
     }
 
     @Produces
     @Second
     protected EntityManager secondEntityManager()
     {
-        return this.secondEntityManager;
+        return secondEntityManager;
     }
 
     public TestEntityManager getDefaultEntityManager()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/FirstLevelTransactionBean.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/FirstLevelTransactionBean.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/FirstLevelTransactionBean.java
index 268c9a5..25bac5a 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/FirstLevelTransactionBean.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/FirstLevelTransactionBean.java
@@ -37,6 +37,6 @@ public class FirstLevelTransactionBean
     @Transactional
     public void executeInTransaction()
     {
-        this.nestedTransactionBean.executeInTransaction();
+        nestedTransactionBean.executeInTransaction();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/NestedMultiTransactionUncatchedFlushExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/NestedMultiTransactionUncatchedFlushExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/NestedMultiTransactionUncatchedFlushExceptionTest.java
index 13689e3..c7d6b10 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/NestedMultiTransactionUncatchedFlushExceptionTest.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/NestedMultiTransactionUncatchedFlushExceptionTest.java
@@ -72,8 +72,8 @@ public class NestedMultiTransactionUncatchedFlushExceptionTest
     @Test
     public void nestedMultiTransactionUncatchedFlushExceptionTest()
     {
-        TestEntityManager firstEntityManager = this.entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = this.entityManagerProducer.getSecondEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
+        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
 
         Assert.assertNotNull(firstEntityManager);
         TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
@@ -95,7 +95,7 @@ public class NestedMultiTransactionUncatchedFlushExceptionTest
 
         try
         {
-            this.firstLevelTransactionBean.executeInTransaction();
+            firstLevelTransactionBean.executeInTransaction();
             Assert.fail(TestException.class.getName() + " expected!");
         }
         catch (TestException e)

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/TestEntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/TestEntityManagerProducer.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/TestEntityManagerProducer.java
index cdaab0a..e8be34c 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/TestEntityManagerProducer.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/TestEntityManagerProducer.java
@@ -50,14 +50,14 @@ public class TestEntityManagerProducer
     @First
     protected EntityManager firstEntityManager()
     {
-        return this.firstEntityManager;
+        return firstEntityManager;
     }
 
     @Produces
     @Second
     protected EntityManager secondEntityManager()
     {
-        return this.secondEntityManager;
+        return secondEntityManager;
     }
 
     public TestEntityManager getFirstEntityManager()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/FirstLevelTransactionBean.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/FirstLevelTransactionBean.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/FirstLevelTransactionBean.java
index 6b06976..902e962 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/FirstLevelTransactionBean.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/FirstLevelTransactionBean.java
@@ -37,6 +37,6 @@ public class FirstLevelTransactionBean
     @Transactional
     public void executeInTransaction()
     {
-        this.nestedTransactionBean.executeInTransaction();
+        nestedTransactionBean.executeInTransaction();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/NestedMultiTransactionUncatchedExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/NestedMultiTransactionUncatchedExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/NestedMultiTransactionUncatchedExceptionTest.java
index cceb49f..725bd3b 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/NestedMultiTransactionUncatchedExceptionTest.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/NestedMultiTransactionUncatchedExceptionTest.java
@@ -72,8 +72,8 @@ public class NestedMultiTransactionUncatchedExceptionTest
     @Test
     public void nestedMultiTransactionUncatchedExceptionTest()
     {
-        TestEntityManager firstEntityManager = this.entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = this.entityManagerProducer.getSecondEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
+        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
 
         Assert.assertNotNull(firstEntityManager);
         TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
@@ -95,7 +95,7 @@ public class NestedMultiTransactionUncatchedExceptionTest
 
         try
         {
-            this.firstLevelTransactionBean.executeInTransaction();
+            firstLevelTransactionBean.executeInTransaction();
             Assert.fail(TestException.class.getName() + " expected!");
         }
         catch (TestException e)

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/TestEntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/TestEntityManagerProducer.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/TestEntityManagerProducer.java
index 373e086..6682e75 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/TestEntityManagerProducer.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/TestEntityManagerProducer.java
@@ -37,14 +37,14 @@ public class TestEntityManagerProducer
     @First
     protected EntityManager firstEntityManager()
     {
-        return this.firstEntityManager;
+        return firstEntityManager;
     }
 
     @Produces
     @Second
     protected EntityManager secondEntityManager()
     {
-        return this.secondEntityManager;
+        return secondEntityManager;
     }
 
     public TestEntityManager getFirstEntityManager()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/FirstLevelTransactionBean.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/FirstLevelTransactionBean.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/FirstLevelTransactionBean.java
index f2d2112..25a3280 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/FirstLevelTransactionBean.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/FirstLevelTransactionBean.java
@@ -37,6 +37,6 @@ public class FirstLevelTransactionBean
     @Transactional
     public void executeInTransaction()
     {
-        this.nestedTransactionBean.executeInTransaction();
+        nestedTransactionBean.executeInTransaction();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/NestedTransactionWithExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/NestedTransactionWithExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/NestedTransactionWithExceptionTest.java
index 8a2f003..70e5d18 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/NestedTransactionWithExceptionTest.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/NestedTransactionWithExceptionTest.java
@@ -72,7 +72,7 @@ public class NestedTransactionWithExceptionTest
     @Test
     public void nestedTransactionWithExceptionTest()
     {
-        TestEntityManager firstEntityManager = this.entityManagerProducer.getFirstEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
 
         Assert.assertNotNull(firstEntityManager);
         TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
@@ -85,7 +85,7 @@ public class NestedTransactionWithExceptionTest
 
         try
         {
-            this.firstLevelTransactionBean.executeInTransaction();
+            firstLevelTransactionBean.executeInTransaction();
             Assert.fail(TestException.class.getName() + " expected!");
         }
         catch (TestException e)

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/TestEntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/TestEntityManagerProducer.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/TestEntityManagerProducer.java
index f4ce308..2665336 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/TestEntityManagerProducer.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/nested/TestEntityManagerProducer.java
@@ -34,7 +34,7 @@ public class TestEntityManagerProducer
     @First
     protected EntityManager firstEntityManager()
     {
-        return this.firstEntityManager;
+        return firstEntityManager;
     }
 
     public TestEntityManager getFirstEntityManager()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/auto/MultipleEntityManagerInjectionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/auto/MultipleEntityManagerInjectionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/auto/MultipleEntityManagerInjectionTest.java
index 32b553b..f273337 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/auto/MultipleEntityManagerInjectionTest.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/auto/MultipleEntityManagerInjectionTest.java
@@ -71,9 +71,9 @@ public class MultipleEntityManagerInjectionTest
     @Test
     public void autoEntityManagerInjection()
     {
-        TestEntityManager defaultEntityManager = this.entityManagerProducer.getDefaultEntityManager();
-        TestEntityManager firstEntityManager = this.entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = this.entityManagerProducer.getSecondEntityManager();
+        TestEntityManager defaultEntityManager = entityManagerProducer.getDefaultEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
+        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
 
         Assert.assertNotNull(defaultEntityManager);
         TestEntityTransaction defaultTransaction = (TestEntityTransaction) (defaultEntityManager).getTransaction();
@@ -102,7 +102,7 @@ public class MultipleEntityManagerInjectionTest
         Assert.assertEquals(false, secondTransaction.isCommitted());
         Assert.assertEquals(false, secondTransaction.isRolledBack());
 
-        this.multiTransactionBean.executeInTransaction();
+        multiTransactionBean.executeInTransaction();
 
         Assert.assertEquals(true, defaultEntityManager.isFlushed());
         Assert.assertEquals(false, defaultTransaction.isActive());

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/auto/TestEntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/auto/TestEntityManagerProducer.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/auto/TestEntityManagerProducer.java
index cae065e..ea43522 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/auto/TestEntityManagerProducer.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/auto/TestEntityManagerProducer.java
@@ -38,21 +38,21 @@ public class TestEntityManagerProducer
     @Produces
     protected EntityManager defaultEntityManager()
     {
-        return this.defaultEntityManager;
+        return defaultEntityManager;
     }
 
     @Produces
     @First
     protected EntityManager firstEntityManager()
     {
-        return this.firstEntityManager;
+        return firstEntityManager;
     }
 
     @Produces
     @Second
     protected EntityManager secondEntityManager()
     {
-        return this.secondEntityManager;
+        return secondEntityManager;
     }
 
     public TestEntityManager getDefaultEntityManager()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/manual/ManualTransactionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/manual/ManualTransactionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/manual/ManualTransactionTest.java
index 7bead07..c6a4134 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/manual/ManualTransactionTest.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/manual/ManualTransactionTest.java
@@ -71,9 +71,9 @@ public class ManualTransactionTest
     @Test
     public void manualTransactionTest()
     {
-        TestEntityManager defaultEntityManager = this.entityManagerProducer.getDefaultEntityManager();
-        TestEntityManager firstEntityManager = this.entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = this.entityManagerProducer.getSecondEntityManager();
+        TestEntityManager defaultEntityManager = entityManagerProducer.getDefaultEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
+        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
 
         Assert.assertNotNull(defaultEntityManager);
         TestEntityTransaction defaultTransaction = (TestEntityTransaction) (defaultEntityManager).getTransaction();
@@ -102,7 +102,7 @@ public class ManualTransactionTest
         Assert.assertEquals(false, secondTransaction.isCommitted());
         Assert.assertEquals(false, secondTransaction.isRolledBack());
 
-        this.manualTransactionBean.executeInDefaultTransaction();
+        manualTransactionBean.executeInDefaultTransaction();
 
         Assert.assertEquals(true, defaultEntityManager.isFlushed());
         Assert.assertEquals(false, defaultTransaction.isActive());
@@ -122,7 +122,7 @@ public class ManualTransactionTest
         Assert.assertEquals(false, secondTransaction.isCommitted());
         Assert.assertEquals(false, secondTransaction.isRolledBack());
 
-        this.manualTransactionBean.executeInFirstTransaction();
+        manualTransactionBean.executeInFirstTransaction();
 
         Assert.assertEquals(true, firstEntityManager.isFlushed());
         Assert.assertEquals(false, firstTransaction.isActive());
@@ -136,7 +136,7 @@ public class ManualTransactionTest
         Assert.assertEquals(false, secondTransaction.isCommitted());
         Assert.assertEquals(false, secondTransaction.isRolledBack());
 
-        this.manualTransactionBean.executeInSecondTransaction();
+        manualTransactionBean.executeInSecondTransaction();
 
         Assert.assertEquals(true, secondEntityManager.isFlushed());
         Assert.assertEquals(false, secondTransaction.isActive());

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/manual/TestEntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/manual/TestEntityManagerProducer.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/manual/TestEntityManagerProducer.java
index df6f6a5..2328091 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/manual/TestEntityManagerProducer.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/manual/TestEntityManagerProducer.java
@@ -38,21 +38,21 @@ public class TestEntityManagerProducer
     @Produces
     protected EntityManager defaultEntityManager()
     {
-        return this.defaultEntityManager;
+        return defaultEntityManager;
     }
 
     @Produces
     @First
     protected EntityManager firstEntityManager()
     {
-        return this.firstEntityManager;
+        return firstEntityManager;
     }
 
     @Produces
     @Second
     protected EntityManager secondEntityManager()
     {
-        return this.secondEntityManager;
+        return secondEntityManager;
     }
 
     public TestEntityManager getDefaultEntityManager()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/FirstLevelTransactionBean.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/FirstLevelTransactionBean.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/FirstLevelTransactionBean.java
index 368966e..cb9cea4 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/FirstLevelTransactionBean.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/FirstLevelTransactionBean.java
@@ -37,6 +37,6 @@ public class FirstLevelTransactionBean
     @Transactional
     public void executeInTransaction()
     {
-        this.nestedTransactionBean.executeInTransaction();
+        nestedTransactionBean.executeInTransaction();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/NestedMultiTransactionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/NestedMultiTransactionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/NestedMultiTransactionTest.java
index a76cad7..637a34f 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/NestedMultiTransactionTest.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/NestedMultiTransactionTest.java
@@ -71,8 +71,8 @@ public class NestedMultiTransactionTest
     @Test
     public void nestedMultiTransactionTest()
     {
-        TestEntityManager firstEntityManager = this.entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = this.entityManagerProducer.getSecondEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
+        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
 
         Assert.assertNotNull(firstEntityManager);
         TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
@@ -92,7 +92,7 @@ public class NestedMultiTransactionTest
         Assert.assertEquals(false, secondTransaction.isCommitted());
         Assert.assertEquals(false, secondTransaction.isRolledBack());
 
-        this.firstLevelTransactionBean.executeInTransaction();
+        firstLevelTransactionBean.executeInTransaction();
 
         Assert.assertEquals(true, firstEntityManager.isFlushed());
         Assert.assertEquals(false, firstTransaction.isActive());

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/TestEntityManagerProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/TestEntityManagerProducer.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/TestEntityManagerProducer.java
index ace816b..47f54e7 100644
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/TestEntityManagerProducer.java
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/multipleinjection/nested/TestEntityManagerProducer.java
@@ -37,14 +37,14 @@ public class TestEntityManagerProducer
     @First
     protected EntityManager firstEntityManager()
     {
-        return this.firstEntityManager;
+        return firstEntityManager;
     }
 
     @Produces
     @Second
     protected EntityManager secondEntityManager()
     {
-        return this.secondEntityManager;
+        return secondEntityManager;
     }
 
     public TestEntityManager getFirstEntityManager()