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
[1/5] git commit: DELTASPIKE-102 sonar - remove unnecessary 'this'
Updated Branches:
refs/heads/master 00a45bcde -> 8a8878faf
DELTASPIKE-102 sonar - remove unnecessary 'this'
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/8a8878fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/8a8878fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/8a8878fa
Branch: refs/heads/master
Commit: 8a8878faf2c12e69ba742dff1fb803b6f7d713b2
Parents: e1d8b25
Author: Mark Struberg <st...@apache.org>
Authored: Tue Jun 12 11:44:45 2012 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Tue Jun 12 11:44:45 2012 +0200
----------------------------------------------------------------------
.../deltaspike/cdise/weld/ContextController.java | 72 +++++++-------
.../deltaspike/cdise/weld/WeldContextControl.java | 8 +-
.../api/exception/control/ExceptionStackItem.java | 4 +-
.../control/event/ExceptionStackEvent.java | 46 +++++-----
.../control/event/ExceptionToCatchEvent.java | 8 +-
.../api/literal/MessageContextConfigLiteral.java | 6 +-
.../deltaspike/core/api/literal/NamedLiteral.java | 2 +-
.../core/api/projectstage/ProjectStage.java | 2 +-
.../deltaspike/core/util/HierarchyDiscovery.java | 2 +-
.../util/metadata/AnnotationInstanceProvider.java | 10 +-
.../metadata/builder/AnnotatedCallableImpl.java | 2 +-
.../core/util/metadata/builder/AnnotatedImpl.java | 2 +-
.../util/metadata/builder/AnnotatedMemberImpl.java | 2 +-
.../metadata/builder/AnnotatedTypeBuilder.java | 22 ++--
.../util/metadata/builder/AnnotatedTypeImpl.java | 8 +-
.../util/metadata/builder/AnnotationBuilder.java | 4 +-
.../util/metadata/builder/AnnotationStore.java | 4 +-
.../metadata/builder/ImmutableInjectionPoint.java | 28 +++---
.../apache/deltaspike/test/api/metadata/Cat.java | 2 +-
.../core/impl/config/BaseConfigSource.java | 2 +-
.../impl/config/DefaultConfigSourceProvider.java | 10 +-
.../impl/config/injectable/ConfigPropertyBean.java | 28 +++---
.../extension/ConfigPropertyExtension.java | 12 +-
.../impl/converter/DefaultConverterFactory.java | 6 +-
.../exception/control/DefaultExceptionEvent.java | 32 +++---
.../control/ExceptionHandlerComparator.java | 2 +-
.../impl/exception/control/HandlerMethodImpl.java | 78 +++++++-------
.../control/HandlerMethodStorageImpl.java | 14 ++--
.../control/OutboundParameterValueRedefiner.java | 6 +-
.../extension/ExceptionControlExtension.java | 4 +-
.../impl/exclude/extension/ExcludeExtension.java | 6 +-
.../core/impl/message/DefaultMessage.java | 12 +-
.../core/impl/message/DefaultMessageBuilder.java | 16 ++--
.../impl/message/DefaultMessageContextConfig.java | 32 +++---
.../core/impl/message/DefaultMessageResolver.java | 6 +-
.../core/impl/message/ImmutableBeanWrapper.java | 2 +-
.../core/impl/message/MessageBundleExtension.java | 10 +-
.../core/impl/message/NarrowingBeanBuilder.java | 20 ++--
.../message/UnmodifiableMessageContextConfig.java | 2 +-
.../alternative/global/GlobalAlternativeTest.java | 6 +-
.../api/alternative/local/BdaAlternativeTest.java | 2 +-
.../core/api/config/injectable/SettingsBean.java | 2 +-
.../test/core/api/message/MessageContextTest.java | 10 +-
.../test/core/api/message/MessageTest.java | 4 +-
.../test/core/api/message/SimpleMessageTest.java | 2 +-
.../test/core/api/message/TestMessageResolver.java | 6 +-
.../impl/exception/control/event/EventTest.java | 10 +-
.../control/flow/BreadthFirstAbortControlTest.java | 4 +-
.../control/flow/DepthAbortControlTest.java | 4 +-
.../control/flow/HandledExceptionHandlerTest.java | 8 +-
.../control/flow/ProceedCauseHandlerTest.java | 8 +-
.../control/handler/CallingHandlersTest.java | 16 ++--
.../control/handler/UnMuteHandlerTest.java | 4 +-
.../impl/transaction/TransactionalInterceptor.java | 2 +-
.../test/jpa/api/shared/TestEntityManager.java | 10 +-
.../test/jpa/api/shared/TestEntityTransaction.java | 10 +-
.../DefaultEntityManagerInjectionTest.java | 12 +-
.../TestEntityManagerProducer.java | 4 +-
.../DefaultNestedTransactionTest.java | 4 +-
.../defaultnested/FirstLevelTransactionBean.java | 2 +-
.../defaultnested/TestEntityManagerProducer.java | 2 +-
.../nested/FirstLevelTransactionBean.java | 2 +-
...NestedMultiTransactionCatchedExceptionTest.java | 6 +-
.../nested/TestEntityManagerProducer.java | 4 +-
.../catched/nested/FirstLevelTransactionBean.java | 2 +-
.../NestedTransactionCatchedExceptionTest.java | 4 +-
.../catched/nested/TestEntityManagerProducer.java | 2 +-
...tityManagerInjectionUncatchedExceptionTest.java | 8 +-
.../auto/TestEntityManagerProducer.java | 6 +-
...anagerInjectionUncatchedFlushExceptionTest.java | 8 +-
.../flush/auto/TestEntityManagerProducer.java | 6 +-
.../flush/nested/FirstLevelTransactionBean.java | 2 +-
...ultiTransactionUncatchedFlushExceptionTest.java | 6 +-
.../flush/nested/TestEntityManagerProducer.java | 4 +-
.../nested/FirstLevelTransactionBean.java | 2 +-
...stedMultiTransactionUncatchedExceptionTest.java | 6 +-
.../nested/TestEntityManagerProducer.java | 4 +-
.../nested/FirstLevelTransactionBean.java | 2 +-
.../nested/NestedTransactionWithExceptionTest.java | 4 +-
.../nested/TestEntityManagerProducer.java | 2 +-
.../auto/MultipleEntityManagerInjectionTest.java | 8 +-
.../auto/TestEntityManagerProducer.java | 6 +-
.../manual/ManualTransactionTest.java | 12 +-
.../manual/TestEntityManagerProducer.java | 6 +-
.../nested/FirstLevelTransactionBean.java | 2 +-
.../nested/NestedMultiTransactionTest.java | 6 +-
.../nested/TestEntityManagerProducer.java | 4 +-
.../nested/FirstLevelTransactionBean.java | 2 +-
.../nested/NestedTransactionTest.java | 4 +-
.../nested/TestEntityManagerProducer.java | 2 +-
.../stereotype/StereotypeTransactionalTest.java | 4 +-
.../stereotype/TestEntityManagerProducer.java | 2 +-
...ransactionScopedEntityManagerInjectionTest.java | 10 +-
.../TestEntityManagerProducer.java | 8 +-
...aultTransactionScopedNestedTransactionTest.java | 6 +-
.../defaultnested/FirstLevelTransactionBean.java | 2 +-
.../defaultnested/TestEntityManagerProducer.java | 8 +-
...ransactionScopedEntityManagerInjectionTest.java | 14 ++--
.../auto/TestEntityManagerProducer.java | 24 +++---
.../ManualTransactionScopedTransactionTest.java | 18 ++--
.../manual/TestEntityManagerProducer.java | 24 +++---
.../nested/FirstLevelTransactionBean.java | 2 +-
...estedMultiTransactionScopedTransactionTest.java | 10 +-
.../nested/TestEntityManagerProducer.java | 16 ++--
.../nested/FirstLevelTransactionBean.java | 2 +-
.../NestedTransactionScopedTransactionTest.java | 6 +-
.../nested/TestEntityManagerProducer.java | 8 +-
...ereotypeTransactionScopedTransactionalTest.java | 6 +-
.../stereotype/TestEntityManagerProducer.java | 8 +-
.../stereotype/TransactionalBean.java | 4 +-
.../impl/authentication/DefaultIdentity.java | 20 ++--
.../DefaultAccessDecisionVoterContext.java | 22 ++--
.../impl/authorization/SecurityExtension.java | 6 +-
.../impl/authorization/SecurityInterceptor.java | 2 +-
.../authorization/SecurityMetaDataStorage.java | 22 ++--
.../impl/credential/DefaultLoginCredential.java | 6 +-
.../authentication/FailedLoginFailedObserver.java | 2 +-
.../impl/authentication/LoginLogoutTest.java | 46 +++++-----
.../impl/authentication/NewProductInquiry.java | 10 +-
.../test/security/impl/authentication/Shop.java | 2 +-
.../security/impl/authentication/ShopClient.java | 11 +-
.../impl/authentication/TestAuthenticator.java | 8 +-
.../impl/authentication/TestInquiryStorage.java | 6 +-
123 files changed, 572 insertions(+), 571 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/ContextController.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/ContextController.java b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/ContextController.java
index 26b3ade..dec1d0c 100644
--- a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/ContextController.java
+++ b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/ContextController.java
@@ -68,21 +68,21 @@ public class ContextController
//X TODO check if we can remove it
void startApplicationScope()
{
- if (this.applicationScopeStarted)
+ if (applicationScopeStarted)
{
throw new IllegalStateException(ApplicationScoped.class.getName() + " started already");
}
- this.applicationScopeStarted = true;
+ applicationScopeStarted = true;
}
void stopApplicationScope()
{
- if (Boolean.FALSE.equals(this.resetSuccessful) /*|| TODO detect weld 2.x+*/)
+ if (Boolean.FALSE.equals(resetSuccessful) /*|| TODO detect weld 2.x+*/)
{
if (applicationContext.isActive())
{
applicationContext.invalidate();
- this.applicationScopeStarted = false;
+ applicationScopeStarted = false;
}
return;
}
@@ -94,9 +94,9 @@ public class ContextController
BeanStore originalBeanStore = null;
try
{
- Field field = this.applicationContext.getClass().getSuperclass().getDeclaredField("beanStore");
+ Field field = applicationContext.getClass().getSuperclass().getDeclaredField("beanStore");
field.setAccessible(true);
- beanStoreHolder = (org.jboss.weld.bootstrap.api.Singleton)field.get(this.applicationContext);
+ beanStoreHolder = (org.jboss.weld.bootstrap.api.Singleton)field.get(applicationContext);
final BeanStore beanStore = beanStoreHolder.get();
originalBeanStore = beanStore;
@@ -136,13 +136,13 @@ public class ContextController
catch (Exception e)
{
//do nothing
- this.resetSuccessful = false;
+ resetSuccessful = false;
}
catch (LinkageError e)
{
//do nothing - a new version of weld is used which introduced other required dependencies.
//WELD-1072 should be fixed in this version already
- this.resetSuccessful = false;
+ resetSuccessful = false;
}
applicationContext.invalidate();
@@ -170,92 +170,92 @@ public class ContextController
beanStoreHolder.set(originalBeanStore);
}
- this.applicationScopeStarted = false;
+ applicationScopeStarted = false;
- this.resetSuccessful = true;
+ resetSuccessful = true;
}
}
//X TODO check if we can remove it
void startSingletonScope()
{
- if (this.singletonScopeStarted)
+ if (singletonScopeStarted)
{
throw new IllegalStateException(Singleton.class.getName() + " started already");
}
- this.singletonScopeStarted = true;
+ singletonScopeStarted = true;
}
void stopSingletonScope()
{
- this.singletonScopeStarted = false;
+ singletonScopeStarted = false;
}
void startSessionScope()
{
- if (this.sessionMap == null)
+ if (sessionMap == null)
{
- this.sessionMap = new HashMap<String, Object>();
+ sessionMap = new HashMap<String, Object>();
}
else
{
throw new IllegalStateException(SessionScoped.class.getName() + " started already");
}
- this.sessionContext.associate(this.sessionMap);
- this.sessionContext.activate();
+ sessionContext.associate(sessionMap);
+ sessionContext.activate();
}
void stopSessionScope()
{
- if (this.sessionContext.isActive())
+ if (sessionContext.isActive())
{
- this.sessionContext.invalidate();
- this.sessionContext.deactivate();
- this.sessionContext.dissociate(this.sessionMap);
- this.sessionMap = null;
+ sessionContext.invalidate();
+ sessionContext.deactivate();
+ sessionContext.dissociate(sessionMap);
+ sessionMap = null;
}
}
void startConversationScope(String cid)
{
- this.conversationContext.associate(new MutableBoundRequest(this.requestMap, this.sessionMap));
- this.conversationContext.activate(cid);
+ conversationContext.associate(new MutableBoundRequest(requestMap, sessionMap));
+ conversationContext.activate(cid);
}
void stopConversationScope()
{
if (conversationContext.isActive())
{
- this.conversationContext.invalidate();
- this.conversationContext.deactivate();
- this.conversationContext.dissociate(new MutableBoundRequest(this.requestMap, this.sessionMap));
+ conversationContext.invalidate();
+ conversationContext.deactivate();
+ conversationContext.dissociate(new MutableBoundRequest(requestMap, sessionMap));
}
}
void startRequestScope()
{
- if (this.requestMap == null)
+ if (requestMap == null)
{
- this.requestMap = new HashMap<String, Object>();
+ requestMap = new HashMap<String, Object>();
}
else
{
throw new IllegalStateException(RequestScoped.class.getName() + " started already");
}
- this.requestContext.associate(this.requestMap);
- this.requestContext.activate();
+ requestContext.associate(requestMap);
+ requestContext.activate();
}
void stopRequestScope()
{
- if (this.requestContext.isActive())
+ if (requestContext.isActive())
{
- this.requestContext.invalidate();
- this.requestContext.deactivate();
- this.requestContext.dissociate(this.requestMap);
- this.requestMap = null;
+ requestContext.invalidate();
+ requestContext.deactivate();
+ requestContext.dissociate(requestMap);
+ requestMap = null;
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java
index 6957b81..188f651 100644
--- a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java
+++ b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/WeldContextControl.java
@@ -232,13 +232,13 @@ public class WeldContextControl implements ContextControl
private ContextController getContextController()
{
- if (this.contextController != null)
+ if (contextController != null)
{
- return this.contextController;
+ return contextController;
}
- this.contextController = new ContextController();
- return tryToInjectFields(this.contextController);
+ contextController = new ContextController();
+ return tryToInjectFields(contextController);
}
private <T> T tryToInjectFields(T instance)
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/ExceptionStackItem.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/ExceptionStackItem.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/ExceptionStackItem.java
index 14ec670..157f6a3 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/ExceptionStackItem.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/ExceptionStackItem.java
@@ -48,12 +48,12 @@ public final class ExceptionStackItem implements Serializable
public StackTraceElement[] getStackTraceElements()
{
- return this.stackTraceElements.clone();
+ return stackTraceElements.clone();
}
public Throwable getThrowable()
{
- return this.throwable;
+ return throwable;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionStackEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionStackEvent.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionStackEvent.java
index 9d6695a..945aa54 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionStackEvent.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionStackEvent.java
@@ -61,11 +61,11 @@ public class ExceptionStackEvent implements Serializable
}
Throwable e = exception;
- this.exceptionStackItems = new ArrayDeque<ExceptionStackItem>();
+ exceptionStackItems = new ArrayDeque<ExceptionStackItem>();
do
{
- this.exceptionStackItems.addFirst(new ExceptionStackItem(e));
+ exceptionStackItems.addFirst(new ExceptionStackItem(e));
if (e instanceof SQLException)
{
SQLException sqlException = (SQLException) e;
@@ -73,37 +73,37 @@ public class ExceptionStackEvent implements Serializable
while (sqlException.getNextException() != null)
{
sqlException = sqlException.getNextException();
- this.exceptionStackItems.addFirst(new ExceptionStackItem(sqlException));
+ exceptionStackItems.addFirst(new ExceptionStackItem(sqlException));
}
}
e = e.getCause();
}
while (e != null);
- this.initialStackSize = this.exceptionStackItems.size();
- this.causes = this.createThrowableCollection(exceptionStackItems);
+ initialStackSize = exceptionStackItems.size();
+ causes = createThrowableCollection(exceptionStackItems);
// TODO: Later this.origExceptionStackItems = new ArrayDeque<ExceptionStackItem>(exceptionStackItems);
- this.init();
+ init();
}
private void init()
{
- this.root = this.exceptionStackItems.size() == this.initialStackSize;
+ root = exceptionStackItems.size() == initialStackSize;
- if (!this.exceptionStackItems.isEmpty())
+ if (!exceptionStackItems.isEmpty())
{
- this.current = this.exceptionStackItems.removeFirst().getThrowable();
- this.remaining = Collections.unmodifiableCollection(this.exceptionStackItems);
+ current = exceptionStackItems.removeFirst().getThrowable();
+ remaining = Collections.unmodifiableCollection(exceptionStackItems);
}
else
{
- this.remaining = Collections.emptyList();
- this.current = null;
+ remaining = Collections.emptyList();
+ current = null;
}
- this.last = this.remaining.isEmpty();
- this.next = (this.last) ? null : this.exceptionStackItems.peekFirst().getThrowable();
+ last = remaining.isEmpty();
+ next = (last) ? null : exceptionStackItems.peekFirst().getThrowable();
}
private Collection<ExceptionStackItem> createExceptionStackFrom(Collection<Throwable> throwables)
@@ -133,7 +133,7 @@ public class ExceptionStackEvent implements Serializable
public Collection<Throwable> getCauseElements()
{
- return Collections.unmodifiableCollection(this.causes);
+ return Collections.unmodifiableCollection(causes);
}
/**
@@ -143,17 +143,17 @@ public class ExceptionStackEvent implements Serializable
*/
public boolean isLast()
{
- return this.last;
+ return last;
}
public Throwable getNext()
{
- return this.next;
+ return next;
}
public Collection<Throwable> getRemaining()
{
- return Collections.unmodifiableCollection(this.createThrowableCollection(this.remaining));
+ return Collections.unmodifiableCollection(createThrowableCollection(remaining));
}
/**
@@ -163,7 +163,7 @@ public class ExceptionStackEvent implements Serializable
*/
public boolean isRoot()
{
- return this.root;
+ return root;
}
/**
@@ -173,7 +173,7 @@ public class ExceptionStackEvent implements Serializable
*/
public Throwable getCurrent()
{
- return this.current;
+ return current;
}
/**
@@ -183,8 +183,8 @@ public class ExceptionStackEvent implements Serializable
*/
public void setCauseElements(Collection<Throwable> elements)
{
- this.exceptionStackItems = new ArrayDeque<ExceptionStackItem>(this.createExceptionStackFrom(elements));
- this.init();
+ exceptionStackItems = new ArrayDeque<ExceptionStackItem>(createExceptionStackFrom(elements));
+ init();
}
/**
@@ -192,7 +192,7 @@ public class ExceptionStackEvent implements Serializable
*/
public void skipCause()
{
- this.init();
+ init();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionToCatchEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionToCatchEvent.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionToCatchEvent.java
index 4872b93..96d29e1 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionToCatchEvent.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/exception/control/event/ExceptionToCatchEvent.java
@@ -62,12 +62,12 @@ public class ExceptionToCatchEvent implements Serializable
public ExceptionToCatchEvent(Throwable exception)
{
this.exception = exception;
- this.qualifiers = Collections.emptySet();
+ qualifiers = Collections.emptySet();
}
public Throwable getException()
{
- return this.exception;
+ return exception;
}
/**
@@ -87,7 +87,7 @@ public class ExceptionToCatchEvent implements Serializable
*/
public boolean isHandled()
{
- return this.handled;
+ return handled;
}
/**
@@ -97,6 +97,6 @@ public class ExceptionToCatchEvent implements Serializable
*/
public Set<Annotation> getQualifiers()
{
- return Collections.unmodifiableSet(this.qualifiers);
+ return Collections.unmodifiableSet(qualifiers);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/MessageContextConfigLiteral.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/MessageContextConfigLiteral.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/MessageContextConfigLiteral.java
index bd32933..9eba8f0 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/MessageContextConfigLiteral.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/MessageContextConfigLiteral.java
@@ -53,18 +53,18 @@ public class MessageContextConfigLiteral extends AnnotationLiteral<MessageContex
@Override
public Class<? extends MessageResolver> messageResolver()
{
- return this.messageResolver;
+ return messageResolver;
}
@Override
public Class<? extends MessageInterpolator> messageInterpolator()
{
- return this.messageInterpolator;
+ return messageInterpolator;
}
@Override
public Class<? extends LocaleResolver> localeResolver()
{
- return this.localeResolver;
+ return localeResolver;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/NamedLiteral.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/NamedLiteral.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/NamedLiteral.java
index 5aa0d89..748983c 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/NamedLiteral.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/NamedLiteral.java
@@ -38,7 +38,7 @@ public class NamedLiteral extends AnnotationLiteral<Named> implements Named
public NamedLiteral()
{
- this.value = "";
+ value = "";
}
@Override public String value()
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
index 9fe442e..375c57e 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
@@ -152,7 +152,7 @@ public abstract class ProjectStage implements Serializable
*/
protected ProjectStage()
{
- String projectStageClassName = this.getClass().getSimpleName();
+ String projectStageClassName = getClass().getSimpleName();
psName = projectStageClassName;
init(projectStageClassName, this);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java
index 2d7bb8c..b0a68ee 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java
@@ -65,7 +65,7 @@ public class HierarchyDiscovery
private void init()
{
- this.types = new HashMap<Type, Class<?>>();
+ types = new HashMap<Type, Class<?>>();
try
{
discoverTypes(type);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/AnnotationInstanceProvider.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/AnnotationInstanceProvider.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/AnnotationInstanceProvider.java
index 2bcb704..22398af 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/AnnotationInstanceProvider.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/AnnotationInstanceProvider.java
@@ -140,9 +140,9 @@ public class AnnotationInstanceProvider implements Annotation, InvocationHandler
}
else
{
- if (this.memberValues.containsKey(method.getName()))
+ if (memberValues.containsKey(method.getName()))
{
- return this.memberValues.get(method.getName());
+ return memberValues.get(method.getName());
}
else // Default cause, probably won't ever happen, unless annotations get actual methods
{
@@ -169,7 +169,7 @@ public class AnnotationInstanceProvider implements Annotation, InvocationHandler
@Override
public String toString()
{
- Method[] methods = this.annotationClass.getDeclaredMethods();
+ Method[] methods = annotationClass.getDeclaredMethods();
StringBuilder sb = new StringBuilder("@" + annotationType().getName() + "(");
int length = methods.length;
@@ -213,7 +213,7 @@ public class AnnotationInstanceProvider implements Annotation, InvocationHandler
{
if (annotationClass.isInstance(o))
{
- for (Map.Entry<String, ?> entry : this.memberValues.entrySet())
+ for (Map.Entry<String, ?> entry : memberValues.entrySet())
{
try
{
@@ -268,7 +268,7 @@ public class AnnotationInstanceProvider implements Annotation, InvocationHandler
{
try
{
- Object value = this.invoke(this, m, EMPTY_OBJECT_ARRAY);
+ Object value = invoke(this, m, EMPTY_OBJECT_ARRAY);
if (value == null)
{
throw new IllegalStateException(String.format("Annotation method %s returned null", m));
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedCallableImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedCallableImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedCallableImpl.java
index 5562f35..0e939e1 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedCallableImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedCallableImpl.java
@@ -43,7 +43,7 @@ abstract class AnnotatedCallableImpl<X, Y extends Member> extends AnnotatedMembe
Map<Integer, Type> parameterTypeOverrides)
{
super(declaringType, member, memberType, annotations, genericType, null);
- this.parameters = getAnnotatedParameters(this, parameterTypes, genericTypes, parameterAnnotations,
+ parameters = getAnnotatedParameters(this, parameterTypes, genericTypes, parameterAnnotations,
parameterTypeOverrides);
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedImpl.java
index 9f0f776..44b164a 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedImpl.java
@@ -56,7 +56,7 @@ abstract class AnnotatedImpl implements Annotated
else
{
this.type = overridenType;
- this.typeClosure = Collections.singleton(overridenType);
+ typeClosure = Collections.singleton(overridenType);
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMemberImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMemberImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMemberImpl.java
index 1e6a290..203de92 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMemberImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedMemberImpl.java
@@ -39,7 +39,7 @@ abstract class AnnotatedMemberImpl<X, M extends Member> extends AnnotatedImpl im
{
super(memberType, annotations, genericType, overridenType);
this.declaringType = declaringType;
- this.javaMember = member;
+ javaMember = member;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeBuilder.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeBuilder.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeBuilder.java
index 07ef1d9..10de895 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeBuilder.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeBuilder.java
@@ -71,15 +71,15 @@ public class AnnotatedTypeBuilder<X>
*/
public AnnotatedTypeBuilder()
{
- this.typeAnnotations = new AnnotationBuilder();
- this.constructors = new HashMap<Constructor<?>, AnnotationBuilder>();
- this.constructorParameters = new HashMap<Constructor<?>, Map<Integer, AnnotationBuilder>>();
- this.constructorParameterTypes = new HashMap<Constructor<?>, Map<Integer, Type>>();
- this.fields = new HashMap<Field, AnnotationBuilder>();
- this.fieldTypes = new HashMap<Field, Type>();
- this.methods = new HashMap<Method, AnnotationBuilder>();
- this.methodParameters = new HashMap<Method, Map<Integer, AnnotationBuilder>>();
- this.methodParameterTypes = new HashMap<Method, Map<Integer, Type>>();
+ typeAnnotations = new AnnotationBuilder();
+ constructors = new HashMap<Constructor<?>, AnnotationBuilder>();
+ constructorParameters = new HashMap<Constructor<?>, Map<Integer, AnnotationBuilder>>();
+ constructorParameterTypes = new HashMap<Constructor<?>, Map<Integer, Type>>();
+ fields = new HashMap<Field, AnnotationBuilder>();
+ fieldTypes = new HashMap<Field, Type>();
+ methods = new HashMap<Method, AnnotationBuilder>();
+ methodParameters = new HashMap<Method, Map<Integer, AnnotationBuilder>>();
+ methodParameterTypes = new HashMap<Method, Map<Integer, Type>>();
}
/**
@@ -553,7 +553,7 @@ public class AnnotatedTypeBuilder<X>
}
if (javaClass == null || overwrite)
{
- this.javaClass = type.getJavaClass();
+ javaClass = type.getJavaClass();
}
mergeAnnotationsOnElement(type, overwrite, typeAnnotations);
for (AnnotatedField<? super X> field : type.getFields())
@@ -641,7 +641,7 @@ public class AnnotatedTypeBuilder<X>
}
if (javaClass == null || overwrite)
{
- this.javaClass = type;
+ javaClass = type;
}
for (Annotation annotation : type.getAnnotations())
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeImpl.java
index b79b93c..f029eee 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotatedTypeImpl.java
@@ -63,8 +63,8 @@ class AnnotatedTypeImpl<X> extends AnnotatedImpl implements AnnotatedType<X>
Map<Constructor<?>, Map<Integer, Type>> constructorParameterTypes)
{
super(clazz, typeAnnotations, null, null);
- this.javaClass = clazz;
- this.constructors = new HashSet<AnnotatedConstructor<X>>();
+ javaClass = clazz;
+ constructors = new HashSet<AnnotatedConstructor<X>>();
Set<Constructor<?>> cset = new HashSet<Constructor<?>>();
Set<Method> mset = new HashSet<Method>();
Set<Field> fset = new HashSet<Field>();
@@ -86,7 +86,7 @@ class AnnotatedTypeImpl<X> extends AnnotatedImpl implements AnnotatedType<X>
constructors.add(nc);
}
}
- this.methods = new HashSet<AnnotatedMethod<? super X>>();
+ methods = new HashSet<AnnotatedMethod<? super X>>();
for (Method m : clazz.getMethods())
{
if (!m.getDeclaringClass().equals(Object.class))
@@ -109,7 +109,7 @@ class AnnotatedTypeImpl<X> extends AnnotatedImpl implements AnnotatedType<X>
methods.add(nc);
}
}
- this.fields = new HashSet<AnnotatedField<? super X>>();
+ fields = new HashSet<AnnotatedField<? super X>>();
for (Field f : clazz.getFields())
{
AnnotatedField<X> b = new AnnotatedFieldImpl<X>(this, f, fieldAnnotations.get(f), fieldTypes.get(f));
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java
index b71d9e4..90e16ba 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationBuilder.java
@@ -43,8 +43,8 @@ class AnnotationBuilder
*/
public AnnotationBuilder()
{
- this.annotationMap = new HashMap<Class<? extends Annotation>, Annotation>();
- this.annotationSet = new HashSet<Annotation>();
+ annotationMap = new HashMap<Class<? extends Annotation>, Annotation>();
+ annotationSet = new HashSet<Annotation>();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationStore.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationStore.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationStore.java
index 8a9c813..7167115 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationStore.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/AnnotationStore.java
@@ -43,8 +43,8 @@ class AnnotationStore
AnnotationStore()
{
- this.annotationMap = emptyMap();
- this.annotationSet = emptySet();
+ annotationMap = emptyMap();
+ annotationSet = emptySet();
}
<T extends Annotation> T getAnnotation(Class<T> annotationType)
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ImmutableInjectionPoint.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ImmutableInjectionPoint.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ImmutableInjectionPoint.java
index 8780361..ba5f634 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ImmutableInjectionPoint.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/builder/ImmutableInjectionPoint.java
@@ -66,10 +66,10 @@ public class ImmutableInjectionPoint implements InjectionPoint
public ImmutableInjectionPoint(AnnotatedField<?> field, Set<Annotation> qualifiers, Bean<?> declaringBean,
boolean isTransient, boolean delegate)
{
- this.annotated = field;
- this.member = field.getJavaMember();
+ annotated = field;
+ member = field.getJavaMember();
this.qualifiers = new HashSet<Annotation>(qualifiers);
- this.type = field.getJavaMember().getGenericType();
+ type = field.getJavaMember().getGenericType();
this.isTransient = isTransient;
this.delegate = delegate;
this.declaringBean = declaringBean;
@@ -89,10 +89,10 @@ public class ImmutableInjectionPoint implements InjectionPoint
public ImmutableInjectionPoint(AnnotatedField<?> field, BeanManager beanManager, Bean<?> declaringBean,
boolean isTransient, boolean delegate)
{
- this.annotated = field;
- this.member = field.getJavaMember();
- this.qualifiers = BeanUtils.getQualifiers(beanManager, field.getAnnotations());
- this.type = field.getJavaMember().getGenericType();
+ annotated = field;
+ member = field.getJavaMember();
+ qualifiers = BeanUtils.getQualifiers(beanManager, field.getAnnotations());
+ type = field.getJavaMember().getGenericType();
this.isTransient = isTransient;
this.delegate = delegate;
this.declaringBean = declaringBean;
@@ -112,13 +112,13 @@ public class ImmutableInjectionPoint implements InjectionPoint
public ImmutableInjectionPoint(AnnotatedParameter<?> parameter, Set<Annotation> qualifiers, Bean<?> declaringBean,
boolean isTransient, boolean delegate)
{
- this.annotated = parameter;
- this.member = parameter.getDeclaringCallable().getJavaMember();
+ annotated = parameter;
+ member = parameter.getDeclaringCallable().getJavaMember();
this.qualifiers = new HashSet<Annotation>(qualifiers);
this.isTransient = isTransient;
this.delegate = delegate;
this.declaringBean = declaringBean;
- this.type = parameter.getBaseType();
+ type = parameter.getBaseType();
}
/**
@@ -135,13 +135,13 @@ public class ImmutableInjectionPoint implements InjectionPoint
public ImmutableInjectionPoint(AnnotatedParameter<?> parameter, BeanManager beanManager, Bean<?> declaringBean,
boolean isTransient, boolean delegate)
{
- this.annotated = parameter;
- this.member = parameter.getDeclaringCallable().getJavaMember();
- this.qualifiers = BeanUtils.getQualifiers(beanManager, parameter.getAnnotations());
+ annotated = parameter;
+ member = parameter.getDeclaringCallable().getJavaMember();
+ qualifiers = BeanUtils.getQualifiers(beanManager, parameter.getAnnotations());
this.isTransient = isTransient;
this.delegate = delegate;
this.declaringBean = declaringBean;
- this.type = parameter.getBaseType();
+ type = parameter.getBaseType();
}
public Annotated getAnnotated()
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/Cat.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/Cat.java b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/Cat.java
index 9c5ca43..66ad696 100644
--- a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/Cat.java
+++ b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/metadata/Cat.java
@@ -71,6 +71,6 @@ public class Cat
{
// whoah, someone fires cats around ^^
// at least it tests parameter scanning ;)
- this.color = cat.color;
+ color = cat.color;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/BaseConfigSource.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/BaseConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/BaseConfigSource.java
index 0dbb4ca..f350123 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/BaseConfigSource.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/BaseConfigSource.java
@@ -49,7 +49,7 @@ public abstract class BaseConfigSource implements ConfigSource
*/
protected void initOrdinal(int defaultOrdinal)
{
- this.ordinal = defaultOrdinal;
+ ordinal = defaultOrdinal;
String configuredOrdinalString = getPropertyValue(ConfigSource.DELTASPIKE_ORDINAL);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java
index d96da1a..96aa30e 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java
@@ -48,9 +48,9 @@ public class DefaultConfigSourceProvider implements ConfigSourceProvider
*/
public DefaultConfigSourceProvider()
{
- this.configSources.add(new SystemPropertyConfigSource());
- this.configSources.add(new EnvironmentPropertyConfigSource());
- this.configSources.add(new LocalJndiConfigSource());
+ configSources.add(new SystemPropertyConfigSource());
+ configSources.add(new EnvironmentPropertyConfigSource());
+ configSources.add(new LocalJndiConfigSource());
try
{
@@ -59,7 +59,7 @@ public class DefaultConfigSourceProvider implements ConfigSourceProvider
while (propertyFileUrls.hasMoreElements())
{
URL propertyFileUrl = propertyFileUrls.nextElement();
- this.configSources.add(new PropertyFileConfigSource(propertyFileUrl));
+ configSources.add(new PropertyFileConfigSource(propertyFileUrl));
}
}
catch (IOException ioe)
@@ -74,6 +74,6 @@ public class DefaultConfigSourceProvider implements ConfigSourceProvider
@Override
public List<ConfigSource> getConfigSources()
{
- return this.configSources;
+ return configSources;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/injectable/ConfigPropertyBean.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/injectable/ConfigPropertyBean.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/injectable/ConfigPropertyBean.java
index dca6996..b9c538e 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/injectable/ConfigPropertyBean.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/injectable/ConfigPropertyBean.java
@@ -51,35 +51,35 @@ public class ConfigPropertyBean<T> implements Bean<T>, Serializable
{
this.configProperty = configProperty;
- this.qualifiers = new HashSet<Annotation>();
+ qualifiers = new HashSet<Annotation>();
if (customQualifier != null)
{
- this.qualifiers.add(customQualifier);
+ qualifiers.add(customQualifier);
}
else
{
- this.qualifiers.add(configProperty);
+ qualifiers.add(configProperty);
}
this.customQualifier = customQualifier;
- this.beanType = (Class<?>) targetType;
+ beanType = (Class<?>) targetType;
- this.types = new HashSet<Type>();
- this.types.add(this.beanType);
+ types = new HashSet<Type>();
+ types.add(beanType);
}
@Override
public Set<Type> getTypes()
{
- return this.types;
+ return types;
}
@Override
public Set<Annotation> getQualifiers()
{
- return this.qualifiers;
+ return qualifiers;
}
@Override
@@ -110,7 +110,7 @@ public class ConfigPropertyBean<T> implements Bean<T>, Serializable
@Override
public Class<?> getBeanClass()
{
- return this.beanType;
+ return beanType;
}
@Override
@@ -139,8 +139,8 @@ public class ConfigPropertyBean<T> implements Bean<T>, Serializable
if (Converter.class.equals(configProperty.converter()))
{
//TODO add exception handling, if we throw an exception for an unknown converter
- converter = converterFactory.create(String.class, (Class<?>) this.beanType,
- this.customQualifier != null ? customQualifier.annotationType() : null);
+ converter = converterFactory.create(String.class, (Class<?>) beanType,
+ customQualifier != null ? customQualifier.annotationType() : null);
}
else
{
@@ -154,7 +154,7 @@ public class ConfigPropertyBean<T> implements Bean<T>, Serializable
if (converter == null)
{
- if (String.class.isAssignableFrom(this.beanType))
+ if (String.class.isAssignableFrom(beanType))
{
return (T)configuredValue;
}
@@ -163,9 +163,9 @@ public class ConfigPropertyBean<T> implements Bean<T>, Serializable
String.class.getName() + " -> " + beanType.getName());
}
- if (this.customQualifier != null && converter instanceof MetaDataAwareConverter)
+ if (customQualifier != null && converter instanceof MetaDataAwareConverter)
{
- return (T) ((MetaDataAwareConverter) converter).convert(configuredValue, this.customQualifier);
+ return (T) ((MetaDataAwareConverter) converter).convert(configuredValue, customQualifier);
}
//noinspection unchecked
return (T) converter.convert(configuredValue);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/injectable/extension/ConfigPropertyExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/injectable/extension/ConfigPropertyExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/injectable/extension/ConfigPropertyExtension.java
index 5336570..a3428aa 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/injectable/extension/ConfigPropertyExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/injectable/extension/ConfigPropertyExtension.java
@@ -48,7 +48,7 @@ public class ConfigPropertyExtension implements Extension, Deactivatable
{
initActivation();
- if (!this.isActivated)
+ if (!isActivated)
{
return;
}
@@ -84,7 +84,7 @@ public class ConfigPropertyExtension implements Extension, Deactivatable
throw new IllegalStateException("no configured value found for property: " + configProperty.name());
}
- this.injectionTargets.add(
+ injectionTargets.add(
new InjectionTargetEntry(injectionPoint.getType(), configProperty, qualifier));
}
}
@@ -95,12 +95,12 @@ public class ConfigPropertyExtension implements Extension, Deactivatable
{
initActivation();
- if (!this.isActivated)
+ if (!isActivated)
{
return;
}
- for (InjectionTargetEntry injectionTargetEntry : this.injectionTargets)
+ for (InjectionTargetEntry injectionTargetEntry : injectionTargets)
{
event.addBean(new ConfigPropertyBean<Object>(injectionTargetEntry.getType(), injectionTargetEntry
.getConfigProperty(), injectionTargetEntry.getCustomQualifier()));
@@ -109,9 +109,9 @@ public class ConfigPropertyExtension implements Extension, Deactivatable
protected void initActivation()
{
- if (this.isActivated == null)
+ if (isActivated == null)
{
- this.isActivated = ClassDeactivationUtils.isActivated(getClass());
+ isActivated = ClassDeactivationUtils.isActivated(getClass());
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/converter/DefaultConverterFactory.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/converter/DefaultConverterFactory.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/converter/DefaultConverterFactory.java
index 478b029..1d399cf 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/converter/DefaultConverterFactory.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/converter/DefaultConverterFactory.java
@@ -61,7 +61,7 @@ public class DefaultConverterFactory implements ConverterFactory
Converter<S, T> result;
//try to find meta-data-aware converter
- result = this.converterMapping.get(new ConverterKey(sourceType, targetType, metaDataType));
+ result = converterMapping.get(new ConverterKey(sourceType, targetType, metaDataType));
//for a simple custom configuration-annotation a custom converter isn't required
//in this case the custom annotation is just used to keep the (string-based) property in a central place
@@ -71,7 +71,7 @@ public class DefaultConverterFactory implements ConverterFactory
return result;
}
- return this.converterMapping.get(new ConverterKey(sourceType, targetType, null));
+ return converterMapping.get(new ConverterKey(sourceType, targetType, null));
}
private void addDefaultConverters()
@@ -184,6 +184,6 @@ public class DefaultConverterFactory implements ConverterFactory
}
}
- this.converterMapping.put(new ConverterKey(sourceType, targetType, metaDataType), converter);
+ converterMapping.put(new ConverterKey(sourceType, targetType, metaDataType), converter);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/DefaultExceptionEvent.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/DefaultExceptionEvent.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/DefaultExceptionEvent.java
index f0c664e..ddd2ff0 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/DefaultExceptionEvent.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/DefaultExceptionEvent.java
@@ -59,58 +59,58 @@ public class DefaultExceptionEvent<T extends Throwable> implements Introspective
throw new IllegalArgumentException("null is not valid for stackEvent");
}
- this.exception = (T) stackEvent.getCurrent();
+ exception = (T) stackEvent.getCurrent();
this.beforeTraversal = beforeTraversal;
- this.markedHandled = handled;
- this.flow = ExceptionHandlingFlow.HANDLED_AND_CONTINUE;
+ markedHandled = handled;
+ flow = ExceptionHandlingFlow.HANDLED_AND_CONTINUE;
}
@Override
public T getException()
{
- return this.exception;
+ return exception;
}
@Override
public void abort()
{
- this.flow = ExceptionHandlingFlow.ABORT;
+ flow = ExceptionHandlingFlow.ABORT;
}
@Override
public void throwOriginal()
{
- this.flow = ExceptionHandlingFlow.THROW_ORIGINAL;
+ flow = ExceptionHandlingFlow.THROW_ORIGINAL;
}
@Override
public void handled()
{
- this.flow = ExceptionHandlingFlow.HANDLED;
+ flow = ExceptionHandlingFlow.HANDLED;
}
@Override
public void handledAndContinue()
{
- this.flow = ExceptionHandlingFlow.HANDLED_AND_CONTINUE;
+ flow = ExceptionHandlingFlow.HANDLED_AND_CONTINUE;
}
@Override
public void skipCause()
{
- this.flow = ExceptionHandlingFlow.SKIP_CAUSE;
+ flow = ExceptionHandlingFlow.SKIP_CAUSE;
}
@Override
public void unmute()
{
- this.unmute = true;
+ unmute = true;
}
@Override
public boolean isUnmute()
{
- return this.unmute;
+ return unmute;
}
/* Later
@@ -121,13 +121,13 @@ public class DefaultExceptionEvent<T extends Throwable> implements Introspective
@Override
public ExceptionHandlingFlow getCurrentExceptionHandlingFlow()
{
- return this.flow;
+ return flow;
}
@Override
public boolean isMarkedHandled()
{
- return this.markedHandled;
+ return markedHandled;
}
@Override
@@ -139,13 +139,13 @@ public class DefaultExceptionEvent<T extends Throwable> implements Introspective
@Override
public void rethrow(Throwable t)
{
- this.throwNewException = t;
- this.flow = ExceptionHandlingFlow.THROW;
+ throwNewException = t;
+ flow = ExceptionHandlingFlow.THROW;
}
@Override
public Throwable getThrowNewException()
{
- return this.throwNewException;
+ return throwNewException;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerComparator.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerComparator.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerComparator.java
index c8fca12..328b34a 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerComparator.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/ExceptionHandlerComparator.java
@@ -50,7 +50,7 @@ public final class ExceptionHandlerComparator implements Comparator<HandlerMetho
// before, the other is not
if (lhs.getExceptionType().equals(rhs.getExceptionType()))
{
- final int returnValue = this.comparePrecedence(lhs.getOrdinal(), rhs.getOrdinal(),
+ final int returnValue = comparePrecedence(lhs.getOrdinal(), rhs.getOrdinal(),
lhs.isBeforeHandler());
// Compare number of qualifiers if they exist so handlers that handle the same type
// are both are returned and not thrown out (order doesn't really matter)
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodImpl.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodImpl.java
index e52d417..b469595 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodImpl.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodImpl.java
@@ -79,38 +79,38 @@ public class HandlerMethodImpl<T extends Throwable> implements HandlerMethod<T>
final Set<Annotation> tmpQualifiers = new HashSet<Annotation>();
- this.handler = method;
- this.javaMethod = method.getJavaMember();
+ handler = method;
+ javaMethod = method.getJavaMember();
- this.handlerParameter = findHandlerParameter(method);
+ handlerParameter = findHandlerParameter(method);
- if (!this.handlerParameter.isAnnotationPresent(Handles.class)
- && !this.handlerParameter.isAnnotationPresent(BeforeHandles.class))
+ if (!handlerParameter.isAnnotationPresent(Handles.class)
+ && !handlerParameter.isAnnotationPresent(BeforeHandles.class))
{
throw new IllegalArgumentException("Method is not annotated with @Handles or @BeforeHandles");
}
- this.before = this.handlerParameter.getAnnotation(BeforeHandles.class) != null;
+ before = handlerParameter.getAnnotation(BeforeHandles.class) != null;
- if (this.before)
+ if (before)
{
- this.ordinal = this.handlerParameter.getAnnotation(BeforeHandles.class).ordinal();
+ ordinal = handlerParameter.getAnnotation(BeforeHandles.class).ordinal();
}
else
{
- this.ordinal = this.handlerParameter.getAnnotation(Handles.class).ordinal();
+ ordinal = handlerParameter.getAnnotation(Handles.class).ordinal();
}
- tmpQualifiers.addAll(BeanUtils.getQualifiers(bm, this.handlerParameter.getAnnotations()));
+ tmpQualifiers.addAll(BeanUtils.getQualifiers(bm, handlerParameter.getAnnotations()));
if (tmpQualifiers.isEmpty())
{
tmpQualifiers.add(new AnyLiteral());
}
- this.qualifiers = tmpQualifiers;
- this.beanClass = method.getJavaMember().getDeclaringClass();
- this.exceptionType = ((ParameterizedType) this.handlerParameter.getBaseType()).getActualTypeArguments()[0];
+ qualifiers = tmpQualifiers;
+ beanClass = method.getJavaMember().getDeclaringClass();
+ exceptionType = ((ParameterizedType) handlerParameter.getBaseType()).getActualTypeArguments()[0];
}
/**
@@ -160,29 +160,29 @@ public class HandlerMethodImpl<T extends Throwable> implements HandlerMethod<T>
public Bean<?> getBean()
{
- if (this.bean == null)
+ if (bean == null)
{
initBean();
}
- return this.bean;
+ return bean;
}
private synchronized void initBean()
{
- if (this.bean != null)
+ if (bean != null)
{
return;
}
@SuppressWarnings("unchecked")
- Set<Bean<?>> beans = BeanProvider.getBeanDefinitions(this.beanClass, false, true);
+ Set<Bean<?>> beans = BeanProvider.getBeanDefinitions(beanClass, false, true);
if (beans.size() > 1)
{
//TODO improve exception
- throw new IllegalStateException(beans.size() + " types found - base type: " + this.beanClass.getName());
+ throw new IllegalStateException(beans.size() + " types found - base type: " + beanClass.getName());
}
- this.bean = beans.iterator().next();
+ bean = beans.iterator().next();
}
/**
@@ -191,7 +191,7 @@ public class HandlerMethodImpl<T extends Throwable> implements HandlerMethod<T>
@Override
public Set<Annotation> getQualifiers()
{
- return Collections.unmodifiableSet(this.qualifiers);
+ return Collections.unmodifiableSet(qualifiers);
}
/**
@@ -200,7 +200,7 @@ public class HandlerMethodImpl<T extends Throwable> implements HandlerMethod<T>
@Override
public Type getExceptionType()
{
- return this.exceptionType;
+ return exceptionType;
}
/**
@@ -214,8 +214,8 @@ public class HandlerMethodImpl<T extends Throwable> implements HandlerMethod<T>
{
ctx = getBeanManager().createCreationalContext(null);
@SuppressWarnings("unchecked")
- Object handlerInstance = BeanProvider.getContextualReference(this.beanClass);
- InjectableMethod<?> im = createInjectableMethod(this.handler, this.getBean());
+ Object handlerInstance = BeanProvider.getContextualReference(beanClass);
+ InjectableMethod<?> im = createInjectableMethod(handler, getBean());
im.invoke(handlerInstance, ctx, new OutboundParameterValueRedefiner(event, this));
}
finally
@@ -238,7 +238,7 @@ public class HandlerMethodImpl<T extends Throwable> implements HandlerMethod<T>
@Override
public boolean isBeforeHandler()
{
- return this.before;
+ return before;
}
/**
@@ -247,40 +247,40 @@ public class HandlerMethodImpl<T extends Throwable> implements HandlerMethod<T>
@Override
public int getOrdinal()
{
- return this.ordinal;
+ return ordinal;
}
public AnnotatedParameter<?> getHandlerParameter()
{
- return this.handlerParameter;
+ return handlerParameter;
}
public Set<InjectionPoint> getInjectionPoints()
{
- if (this.injectionPoints == null)
+ if (injectionPoints == null)
{
- this.injectionPoints = new HashSet<InjectionPoint>(handler.getParameters().size() - 1);
+ injectionPoints = new HashSet<InjectionPoint>(handler.getParameters().size() - 1);
for (AnnotatedParameter<?> param : handler.getParameters())
{
- if (!param.equals(this.handlerParameter))
+ if (!param.equals(handlerParameter))
{
- this.injectionPoints.add(
+ injectionPoints.add(
new ImmutableInjectionPoint(param, getBeanManager(), getBean(), false, false));
}
}
}
- return new HashSet<InjectionPoint>(this.injectionPoints);
+ return new HashSet<InjectionPoint>(injectionPoints);
}
private BeanManager getBeanManager()
{
- if (this.beanManager == null)
+ if (beanManager == null)
{
- this.beanManager = BeanManagerProvider.getInstance().getBeanManager();
+ beanManager = BeanManagerProvider.getInstance().getBeanManager();
}
- return this.beanManager;
+ return beanManager;
}
@Override
@@ -325,10 +325,10 @@ public class HandlerMethodImpl<T extends Throwable> implements HandlerMethod<T>
@Override
public String toString()
{
- return new StringBuilder("Qualifiers: ").append(this.qualifiers).append(" ")
- .append("Handles Type: ").append(this.exceptionType).append(" ")
- .append("Before: ").append(this.before).append(" ")
- .append("Precedence: ").append(this.ordinal).append(" ")
- .append(this.handler.toString()).toString();
+ return new StringBuilder("Qualifiers: ").append(qualifiers).append(" ")
+ .append("Handles Type: ").append(exceptionType).append(" ")
+ .append("Before: ").append(before).append(" ")
+ .append("Precedence: ").append(ordinal).append(" ")
+ .append(handler.toString()).toString();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageImpl.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageImpl.java
index 3d9db29..b6372da 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageImpl.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageImpl.java
@@ -56,13 +56,13 @@ class HandlerMethodStorageImpl implements HandlerMethodStorage
public <T extends Throwable> void registerHandlerMethod(HandlerMethod<T> handlerMethod)
{
log.fine(String.format("Adding handler %s to known handlers", handlerMethod));
- if (this.allHandlers.containsKey(handlerMethod.getExceptionType()))
+ if (allHandlers.containsKey(handlerMethod.getExceptionType()))
{
- this.allHandlers.get(handlerMethod.getExceptionType()).add(handlerMethod);
+ allHandlers.get(handlerMethod.getExceptionType()).add(handlerMethod);
}
else
{
- this.allHandlers.put(handlerMethod.getExceptionType(),
+ allHandlers.put(handlerMethod.getExceptionType(),
new HashSet<HandlerMethod<? extends Throwable>>(Arrays.asList(handlerMethod)));
}
}
@@ -80,9 +80,9 @@ class HandlerMethodStorageImpl implements HandlerMethodStorage
for (Type hierarchyType : closure)
{
- if (this.allHandlers.get(hierarchyType) != null)
+ if (allHandlers.get(hierarchyType) != null)
{
- for (HandlerMethod<?> handler : this.allHandlers.get(hierarchyType))
+ for (HandlerMethod<?> handler : allHandlers.get(hierarchyType))
{
if (handler.isBeforeHandler() && isBefore)
{
@@ -92,7 +92,7 @@ class HandlerMethodStorageImpl implements HandlerMethodStorage
}
else
{
- if (!handlerQualifiers.isEmpty() && this.containsAny(handler.getQualifiers(),
+ if (!handlerQualifiers.isEmpty() && containsAny(handler.getQualifiers(),
handlerQualifiers))
{
returningHandlers.add(handler);
@@ -107,7 +107,7 @@ class HandlerMethodStorageImpl implements HandlerMethodStorage
}
else
{
- if (!handlerQualifiers.isEmpty() && this.containsAny(handler.getQualifiers(),
+ if (!handlerQualifiers.isEmpty() && containsAny(handler.getQualifiers(),
handlerQualifiers))
{
returningHandlers.add(handler);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/OutboundParameterValueRedefiner.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/OutboundParameterValueRedefiner.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/OutboundParameterValueRedefiner.java
index fcef05c..c735eb6 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/OutboundParameterValueRedefiner.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/OutboundParameterValueRedefiner.java
@@ -45,7 +45,7 @@ class OutboundParameterValueRedefiner implements ParameterValueRedefiner
OutboundParameterValueRedefiner(final ExceptionEvent<?> event, final HandlerMethodImpl<?> handlerMethod)
{
this.event = event;
- this.declaringBean = handlerMethod.getBean();
+ declaringBean = handlerMethod.getBean();
this.handlerMethod = handlerMethod;
}
@@ -56,11 +56,11 @@ class OutboundParameterValueRedefiner implements ParameterValueRedefiner
public Object redefineParameterValue(ParameterValue value)
{
CreationalContext<?> ctx = BeanManagerProvider.getInstance().getBeanManager()
- .createCreationalContext(this.declaringBean);
+ .createCreationalContext(declaringBean);
try
{
- if (value.getPosition() == this.handlerMethod.getHandlerParameter().getPosition())
+ if (value.getPosition() == handlerMethod.getHandlerParameter().getPosition())
{
return event;
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/extension/ExceptionControlExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/extension/ExceptionControlExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/extension/ExceptionControlExtension.java
index 3f48d00..7d0c442 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/extension/ExceptionControlExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/extension/ExceptionControlExtension.java
@@ -84,7 +84,7 @@ public class ExceptionControlExtension implements Extension, Deactivatable
@SuppressWarnings("UnusedDeclaration")
public <T> void findHandlers(@Observes final ProcessBean<?> processBean, final BeanManager beanManager)
{
- if (!this.isActivated)
+ if (!isActivated)
{
return;
}
@@ -129,7 +129,7 @@ public class ExceptionControlExtension implements Extension, Deactivatable
final AfterDeploymentValidation afterDeploymentValidation,
final BeanManager beanManager)
{
- if (!this.isActivated)
+ if (!isActivated)
{
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
index 9df56ff..459f91c 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java
@@ -84,7 +84,7 @@ public class ExcludeExtension implements Extension, Deactivatable
initActivation();
//we need to do it before the exclude logic to keep the @Exclude support for global alternatives
- if (this.isGlobalAlternativeActivated)
+ if (isGlobalAlternativeActivated)
{
detectCdiImplementation();
@@ -98,12 +98,12 @@ public class ExcludeExtension implements Extension, Deactivatable
}
}
- if (this.isCustomProjectStageBeanFilterActivated)
+ if (isCustomProjectStageBeanFilterActivated)
{
vetoCustomProjectStageBeans(processAnnotatedType);
}
- if (!this.isActivated)
+ if (!isActivated)
{
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
index 59f8139..671c0c2 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java
@@ -103,31 +103,31 @@ class DefaultMessage implements Message
protected void addNumberedArgument(Serializable argument)
{
- if (this.arguments == null)
+ if (arguments == null)
{
- this.arguments = new ArrayList<Object>();
+ arguments = new ArrayList<Object>();
}
- this.arguments.add(argument);
+ arguments.add(argument);
}
@Override
public String getMessageTemplate()
{
- return this.messageTemplate;
+ return messageTemplate;
}
@Override
public Object[] getArguments()
{
- return this.arguments.toArray();
+ return arguments.toArray();
}
@Override
public String toString()
{
- return toString(new DefaultMessageContext(this.messageContextConfig));
+ return toString(new DefaultMessageContext(messageContextConfig));
}
public String toString(MessageContext messageContext)
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageBuilder.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageBuilder.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageBuilder.java
index 929b564..899ee22 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageBuilder.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageBuilder.java
@@ -59,26 +59,26 @@ class DefaultMessageBuilder implements MessageContext.MessageBuilder
@Override
public MessageContext.MessageBuilder argument(Object... arguments)
{
- Collections.addAll(this.argumentList, arguments);
+ Collections.addAll(argumentList, arguments);
return this;
}
private Message buildMessageTemplate()
{
- if (this.messageTemplate == null)
+ if (messageTemplate == null)
{
throw new IllegalStateException("messageTemplate is missing");
}
- return new DefaultMessage(this.messageContext.config(), this.messageTemplate,
- this.argumentList.toArray(new Object[this.argumentList.size()]));
+ return new DefaultMessage(messageContext.config(), messageTemplate,
+ argumentList.toArray(new Object[argumentList.size()]));
}
protected void reset()
{
- this.messageTemplate = null;
- this.argumentList = new ArrayList<Object>();
+ messageTemplate = null;
+ argumentList = new ArrayList<Object>();
}
@Override
@@ -101,13 +101,13 @@ class DefaultMessageBuilder implements MessageContext.MessageBuilder
{
String messageTemplate = baseMessage.getMessageTemplate();
- MessageResolver messageResolver = this.messageContext.config().getMessageResolver();
+ MessageResolver messageResolver = messageContext.config().getMessageResolver();
if (messageResolver != null)
{
messageTemplate = resolveMessage(messageResolver, baseMessage);
}
- MessageInterpolator messageInterpolator = this.messageContext.config().getMessageInterpolator();
+ MessageInterpolator messageInterpolator = messageContext.config().getMessageInterpolator();
if (messageInterpolator != null && messageTemplate != null)
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContextConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContextConfig.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContextConfig.java
index c802477..5ba7885 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContextConfig.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContextConfig.java
@@ -45,9 +45,9 @@ class DefaultMessageContextConfig implements MessageContext.Config
private DefaultMessageContextConfig(MessageContext.Config messageContextConfigTemplate)
{
this();
- this.messageInterpolator = messageContextConfigTemplate.getMessageInterpolator();
- this.messageResolver = messageContextConfigTemplate.getMessageResolver();
- this.localeResolver = messageContextConfigTemplate.getLocaleResolver();
+ messageInterpolator = messageContextConfigTemplate.getMessageInterpolator();
+ messageResolver = messageContextConfigTemplate.getMessageResolver();
+ localeResolver = messageContextConfigTemplate.getLocaleResolver();
}
@Override
@@ -82,7 +82,7 @@ class DefaultMessageContextConfig implements MessageContext.Config
@Override
public MessageContext create()
{
- return new DefaultMessageContext(this.newMessageContextConfig);
+ return new DefaultMessageContext(newMessageContextConfig);
}
};
}
@@ -123,27 +123,27 @@ class DefaultMessageContextConfig implements MessageContext.Config
private void resetMessageContextConfig()
{
- this.messageInterpolator = new DefaultMessageInterpolator();
- this.messageResolver = null;
- this.localeResolver = new DefaultLocaleResolver();
+ messageInterpolator = new DefaultMessageInterpolator();
+ messageResolver = null;
+ localeResolver = new DefaultLocaleResolver();
}
@Override
public MessageInterpolator getMessageInterpolator()
{
- return this.messageInterpolator;
+ return messageInterpolator;
}
@Override
public MessageResolver getMessageResolver()
{
- return this.messageResolver;
+ return messageResolver;
}
@Override
public LocaleResolver getLocaleResolver()
{
- return this.localeResolver;
+ return localeResolver;
}
private void setMessageInterpolator(MessageInterpolator messageInterpolator)
@@ -170,9 +170,9 @@ class DefaultMessageContextConfig implements MessageContext.Config
configInfo.append(getClass().getName());
configInfo.append(newLine);
- if (this.messageInterpolator != null)
+ if (messageInterpolator != null)
{
- configInfo.append(" MessageInterpolator class: ").append(this.messageInterpolator.getClass());
+ configInfo.append(" MessageInterpolator class: ").append(messageInterpolator.getClass());
}
else
{
@@ -180,9 +180,9 @@ class DefaultMessageContextConfig implements MessageContext.Config
}
configInfo.append(newLine);
- if (this.messageResolver != null)
+ if (messageResolver != null)
{
- configInfo.append(" MessageResolver class: ").append(this.messageResolver.getClass());
+ configInfo.append(" MessageResolver class: ").append(messageResolver.getClass());
}
else
{
@@ -192,9 +192,9 @@ class DefaultMessageContextConfig implements MessageContext.Config
configInfo.append(newLine);
- if (this.localeResolver != null)
+ if (localeResolver != null)
{
- configInfo.append(" LocaleResolver class: ").append(this.localeResolver.getClass());
+ configInfo.append(" LocaleResolver class: ").append(localeResolver.getClass());
}
else
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/8a8878fa/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageResolver.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageResolver.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageResolver.java
index 0c1d5f3..a890ec0 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageResolver.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageResolver.java
@@ -46,18 +46,18 @@ class DefaultMessageResolver 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("}"))
{
try
{
- return this.messageBundle.getString(messageTemplate.substring(1, messageTemplate.length() - 1));
+ return messageBundle.getString(messageTemplate.substring(1, messageTemplate.length() - 1));
}
catch (MissingResourceException e)
{