Author: tandraschko
Date: Tue Dec 11 19:31:03 2018
New Revision: 1848707
URL: http://svn.apache.org/viewvc?rev=1848707&view=rev
Log:
applied netbeans hints
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
Tue Dec 11 19:31:03 2018
@@ -764,7 +764,7 @@ public final class AnnotationManager
public void checkQualifiersParams(Set<Type> apiTypes, Annotation...
qualifiers)
{
- if (apiTypes == null || apiTypes.size() == 0)
+ if (apiTypes == null || apiTypes.isEmpty())
{
throw new IllegalArgumentException("method parameter api types
argument can not be empty");
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
Tue Dec 11 19:31:03 2018
@@ -106,7 +106,7 @@ public class ProducerFieldBean<T> extend
@Override
protected void addToStringInfo(StringBuilder builder)
{
- builder.append(", Producer Field: " + producerField);
+ builder.append(", Producer Field: ").append(producerField);
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
Tue Dec 11 19:31:03 2018
@@ -113,7 +113,7 @@ public class ProducerMethodBean<T> exten
@Override
protected void addToStringInfo(StringBuilder builder)
{
- builder.append(", Producer Method: " + creatorMethod);
+ builder.append(", Producer Method: ").append(creatorMethod);
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
Tue Dec 11 19:31:03 2018
@@ -263,11 +263,11 @@ public abstract class BeanAttributesBuil
}
// No-binding annotation
- if (qualifiers.size() == 0 )
+ if (qualifiers.isEmpty())
{
qualifiers.add(DefaultLiteral.INSTANCE);
}
- else if(qualifiers.size() == 1)
+ else if (qualifiers.size() == 1)
{
// section 2.3.1
// If a bean does not explicitly declare a qualifier other than
@Named or @Any,
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java
Tue Dec 11 19:31:03 2018
@@ -62,7 +62,7 @@ public class ConversationStorageBean imp
@Override
public void destroy(Set<ConversationContext> instance,
CreationalContext<Set<ConversationContext>> context)
{
- if (instance == null || instance.size() == 0)
+ if (instance == null || instance.isEmpty())
{
return;
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
Tue Dec 11 19:31:03 2018
@@ -866,7 +866,7 @@ public final class NotificationManager
public boolean isContainerEvent(AnnotatedParameter<?> annotatedParameter)
{
AnnotatedCallable<?> method =
annotatedParameter.getDeclaringCallable();
- if (!AnnotatedMethod.class.isInstance(method) ||
method.getParameters().size() == 0)
+ if (!AnnotatedMethod.class.isInstance(method) ||
method.getParameters().isEmpty())
{
return false;
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointFactory.java
Tue Dec 11 19:31:03 2018
@@ -120,7 +120,7 @@ public class InjectionPointFactory
Named named = (Named) qualifier;
String value = named.value();
- if (value == null || value.equals(""))
+ if (value == null || value.isEmpty())
{
NamedLiteral namedLiteral = new NamedLiteral();
namedLiteral.setValue(annotField.getJavaMember().getName());
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
Tue Dec 11 19:31:03 2018
@@ -177,7 +177,7 @@ public class InstanceImpl<T> implements
{
Set<Bean<?>> beans = resolveBeans();
- return beans.size() == 0;
+ return beans.isEmpty();
}
/**
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorResolutionService.java
Tue Dec 11 19:31:03 2018
@@ -113,7 +113,7 @@ public class InterceptorResolutionServic
// pick up the decorators
List<Decorator<?>> decorators =
beanManager.unsafeResolveDecorators(beanTypes,
AnnotationUtil.asArray(qualifiers));
- if (decorators.size() == 0)
+ if (decorators.isEmpty())
{
decorators = Collections.emptyList(); // less to store
}
@@ -371,7 +371,7 @@ public class InterceptorResolutionServic
{
verifyLifecycleMethod(lifeycleAnnotation, lifecycleMethod);
- if (lifecycleMethod.getParameters().size() == 0)
+ if (lifecycleMethod.getParameters().isEmpty())
{
foundMethods.add(lifecycleMethod);
calculateEjbMethodInterceptors(methodInterceptorInfo,
allUsedEjbInterceptors, classLevelEjbInterceptors, lifecycleMethod,
failOnFinal);
@@ -637,7 +637,7 @@ public class InterceptorResolutionServic
}
}
- if (cummulatedInterceptorBindings.size() == 0)
+ if (cummulatedInterceptorBindings.isEmpty())
{
return;
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
Tue Dec 11 19:31:03 2018
@@ -94,11 +94,12 @@ abstract class AbstractAnnotatedMember<X
return javaMember.getDeclaringClass();
}
+ @Override
public String toString()
{
StringBuilder builder = new StringBuilder(super.toString());
builder.append(",");
- builder.append("Java Member Name : " + javaMember.getName());
+ builder.append("Java Member Name : ").append(javaMember.getName());
return builder.toString();
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
Tue Dec 11 19:31:03 2018
@@ -169,7 +169,7 @@ public abstract class AbstractProducer<T
protected boolean needsProxy()
{
- return methodInterceptors.size() != 0;
+ return !methodInterceptors.isEmpty();
}
protected boolean hasInterceptorInfo()
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java
Tue Dec 11 19:31:03 2018
@@ -76,13 +76,14 @@ public class AnnotatedParameterImpl<X> e
return position;
}
+ @Override
public String toString()
{
StringBuilder builder = new StringBuilder();
builder.append("Annotated Parameter");
builder.append(",");
- builder.append(super.toString()+ ",");
- builder.append("Position : " + position);
+ builder.append(super.toString()).append(",");
+ builder.append("Position : ").append(position);
return builder.toString();
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
Tue Dec 11 19:31:03 2018
@@ -184,7 +184,7 @@ public class InjectionTargetImpl<T> exte
@Override
protected boolean needsProxy()
{
- return super.needsProxy() || postConstructInterceptors.size() != 0 ||
preDestroyInterceptors.size() != 0;
+ return super.needsProxy() || !postConstructInterceptors.isEmpty() ||
!preDestroyInterceptors.isEmpty();
}
protected boolean hasAroundConstruct()
@@ -308,7 +308,7 @@ public class InjectionTargetImpl<T> exte
internalInstance = (T) dih.getTarget();
}
}
- else if (postConstructMethods == null || postConstructMethods.size()
== 0)
+ else if (postConstructMethods == null ||
postConstructMethods.isEmpty())
{
return;
}
@@ -347,7 +347,7 @@ public class InjectionTargetImpl<T> exte
internalInstance = (T) dih.getTarget();
}
}
- else if (preDestroyMethods == null || preDestroyMethods.size() == 0)
+ else if (preDestroyMethods == null || preDestroyMethods.isEmpty())
{
return;
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1848707&r1=1848706&r2=1848707&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Tue Dec 11 19:31:03 2018
@@ -900,7 +900,7 @@ public final class WebBeansUtil
{
String value = namedQualifier.value();
- if(value == null || value.equals(""))
+ if(value == null || value.isEmpty())
{
Member member = injectionPoint.getMember();
if(!(member instanceof Field))
