This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/master by this push:
new b3b9cb8 simplify a few statements
b3b9cb8 is described below
commit b3b9cb800da3d366b1d0df8111a530190cd3a0c7
Author: Mark Struberg <strub...@apache.org>
AuthorDate: Sun Jun 7 21:57:52 2020 +0200
simplify a few statements
no funcational change, just cleanup
---
.../webbeans/sample/dependent/LoginCheck.java | 7 +--
.../webbeans/ejb/common/component/BaseEjbBean.java | 7 +--
.../webbeans/component/AbstractProducerBean.java | 7 +--
.../apache/webbeans/container/BeanCacheKey.java | 2 +-
.../webbeans/test/injection/generics/BazEnum.java | 2 +-
.../beans/PropertyHolderFactory.java | 2 +-
.../test/unittests/inject/TypedComponentTest.java | 2 +-
.../intercept/EJBInterceptComponentTest.java | 2 +-
.../webbeans/WebBeansInterceptComponentTest.java | 2 +-
.../apache/webbeans/web/jetty9/JettyWebPlugin.java | 14 +-----
.../java/org/apache/webbeans/jms/util/JmsUtil.java | 54 ++++++----------------
.../apache/webbeans/spi/api/ResourceReference.java | 7 +--
.../webbeans/web/tomcat7/TomcatWebPlugin.java | 14 +-----
13 files changed, 28 insertions(+), 94 deletions(-)
diff --git
a/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java
b/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java
index 5c1ba05..931656f 100644
---
a/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java
+++
b/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java
@@ -27,11 +27,6 @@ public class LoginCheck
public boolean checkLogin(String userName, String password)
{
- if(userName.equals("admin") && password.equals("admin"))
- {
- return true;
- }
-
- return false;
+ return userName.equals("admin") && password.equals("admin");
}
}
diff --git
a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
index 9aed502..3dec0b2 100644
---
a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
+++
b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
@@ -83,12 +83,7 @@ public abstract class BaseEjbBean<T> extends
InjectionTargetBean<T> implements E
@Override
public boolean isPassivationCapable()
{
- if(getEjbType() == SessionBeanType.STATEFUL)
- {
- return true;
- }
-
- return false;
+ return getEjbType() == SessionBeanType.STATEFUL;
}
/**
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
index 64ab944..3e72d17 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
@@ -118,12 +118,7 @@ public class AbstractProducerBean<T> extends
AbstractOwbBean<T>
protected boolean isPassivationCapable(Class<?> returnType, Integer
modifiers)
{
- if(Modifier.isFinal(modifiers) &&
!(Serializable.class.isAssignableFrom(returnType)))
- {
- return false;
- }
-
- return true;
+ return !Modifier.isFinal(modifiers) ||
Serializable.class.isAssignableFrom(returnType);
}
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
index 74fb6c6..9b12895 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
@@ -40,7 +40,7 @@ public final class BeanCacheKey
private final Type type;
private final String path;
private final Annotation qualifier;
- private final Annotation qualifiers[];
+ private final Annotation[] qualifiers;
private final int hashCode;
private volatile LazyAnnotatedTypes lazyAnnotatedTypes; // only needed for
the "main" key
private final Function<Class<?>, AnnotatedType<?>> lazyAtLoader;
diff --git
a/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/BazEnum.java
b/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/BazEnum.java
index 614e19d..d030a8d 100644
---
a/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/BazEnum.java
+++
b/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/BazEnum.java
@@ -23,5 +23,5 @@ package org.apache.webbeans.test.injection.generics;
*/
public enum BazEnum
{
- YES, NO;
+ YES, NO
}
diff --git
a/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/injectionpoint/beans/PropertyHolderFactory.java
b/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/injectionpoint/beans/PropertyHolderFactory.java
index fe680c4..e036f2b 100644
---
a/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/injectionpoint/beans/PropertyHolderFactory.java
+++
b/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/injectionpoint/beans/PropertyHolderFactory.java
@@ -137,7 +137,7 @@ public class PropertyHolderFactory {
return true;
}
for (int i = 0; i < strLen; i++) {
- if ((Character.isWhitespace(str.charAt(i)) == false)) {
+ if ((!Character.isWhitespace(str.charAt(i)))) {
return false;
}
}
diff --git
a/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedComponentTest.java
b/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedComponentTest.java
index 119b876..fd54730 100644
---
a/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedComponentTest.java
+++
b/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedComponentTest.java
@@ -47,7 +47,7 @@ public class TypedComponentTest extends AbstractUnitTest
= injectionResolver.implResolveByType(false,
TypedComponentTest.class.getDeclaredField("s").getGenericType(),
DefaultLiteral.INSTANCE);
- Assert.assertTrue(beans.size() == 1 ? true : false);
+ Assert.assertTrue(beans.size() == 1);
}
}
diff --git
a/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
b/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
index 33ba390..7a63e9d 100644
---
a/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
+++
b/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
@@ -76,7 +76,7 @@ public class EJBInterceptComponentTest extends
AbstractUnitTest
Assert.assertEquals(2, arr.length);
Assert.assertTrue("key".equals(arr[0]) && "key2".equals(arr[1]) ||
"key".equals(arr[1]) && "key2".equals(arr[0]));
- shutDownContainer();;
+ shutDownContainer();
}
@Test
diff --git
a/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java
b/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java
index f98fe49..97dc167 100644
---
a/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java
+++
b/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java
@@ -42,7 +42,7 @@ public class WebBeansInterceptComponentTest extends
AbstractUnitTest
addInterceptor(TransactionalInterceptor2.class);
startContainer(TransactionalInterceptor2.class,
WInterceptorComponent.class);
- WInterceptorComponent comp = getInstance(WInterceptorComponent.class);;
+ WInterceptorComponent comp = getInstance(WInterceptorComponent.class);
int s = comp.hello();
Assert.assertEquals(5, s);
diff --git
a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettyWebPlugin.java
b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettyWebPlugin.java
index 76e9ea4..b506480 100644
---
a/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettyWebPlugin.java
+++
b/webbeans-jetty9/src/main/java/org/apache/webbeans/web/jetty9/JettyWebPlugin.java
@@ -84,12 +84,7 @@ public class JettyWebPlugin extends AbstractOwbPlugin
@Override
public boolean supportsJavaEeComponentInjections(Class<?> clazz)
{
- if (isServletSpecClass(clazz))
- {
- return true;
- }
-
- return false;
+ return isServletSpecClass(clazz);
}
private boolean isServletSpecClass(Class<?> clazz)
@@ -121,12 +116,7 @@ public class JettyWebPlugin extends AbstractOwbPlugin
@Override
public boolean supportService(Class<?> serviceClass)
{
- if (serviceClass.equals(SecurityService.class))
- {
- return true;
- }
-
- return false;
+ return serviceClass.equals(SecurityService.class);
}
}
diff --git
a/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
b/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
index d69666a..98aa814 100644
--- a/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
+++ b/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
@@ -56,69 +56,43 @@ public final class JmsUtil
public static boolean isJmsResourceClass(Class<?> clazz)
{
Asserts.assertNotNull(clazz,"clazz parameter");
-
- if(ConnectionFactory.class.isAssignableFrom(clazz) ||
- Connection.class.isAssignableFrom(clazz) ||
- Queue.class.isAssignableFrom(clazz) ||
- Topic.class.isAssignableFrom(clazz) ||
+
+ return ConnectionFactory.class.isAssignableFrom(clazz) ||
+ Connection.class.isAssignableFrom(clazz) ||
+ Queue.class.isAssignableFrom(clazz) ||
+ Topic.class.isAssignableFrom(clazz) ||
MessageProducer.class.isAssignableFrom(clazz) ||
MessageConsumer.class.isAssignableFrom(clazz) ||
- Session.class.isAssignableFrom(clazz))
- {
- return true;
- }
-
- return false;
-
+ Session.class.isAssignableFrom(clazz);
}
public static boolean isJmsQueueTypeResource(Class<?> clazz)
{
- if(QueueConnectionFactory.class.isAssignableFrom(clazz) ||
- QueueConnection.class.isAssignableFrom(clazz) ||
+ return QueueConnectionFactory.class.isAssignableFrom(clazz) ||
+ QueueConnection.class.isAssignableFrom(clazz) ||
QueueSender.class.isAssignableFrom(clazz) ||
QueueReceiver.class.isAssignableFrom(clazz) ||
- QueueSession.class.isAssignableFrom(clazz))
- {
- return true;
- }
-
- return false;
+ QueueSession.class.isAssignableFrom(clazz);
}
public static boolean isJmsQueueResource(Class<?> clazz)
{
- if(Queue.class.isAssignableFrom(clazz))
- {
- return true;
- }
-
- return false;
+ return Queue.class.isAssignableFrom(clazz);
}
public static boolean isJmsTopicResource(Class<?> clazz)
{
- if(Topic.class.isAssignableFrom(clazz))
- {
- return true;
- }
-
- return false;
+ return Topic.class.isAssignableFrom(clazz);
}
public static boolean isJmsTopicTypeResource(Class<?> clazz)
{
- if(TopicConnectionFactory.class.isAssignableFrom(clazz) ||
- TopicConnection.class.isAssignableFrom(clazz) ||
+ return TopicConnectionFactory.class.isAssignableFrom(clazz) ||
+ TopicConnection.class.isAssignableFrom(clazz) ||
TopicSubscriber.class.isAssignableFrom(clazz) ||
TopicPublisher.class.isAssignableFrom(clazz) ||
- TopicSession.class.isAssignableFrom(clazz))
- {
- return true;
- }
-
- return false;
+ TopicSession.class.isAssignableFrom(clazz);
}
private static JNDIService getJNDIService()
diff --git
a/webbeans-spi/src/main/java/org/apache/webbeans/spi/api/ResourceReference.java
b/webbeans-spi/src/main/java/org/apache/webbeans/spi/api/ResourceReference.java
index 526a1db..d5cef34 100644
---
a/webbeans-spi/src/main/java/org/apache/webbeans/spi/api/ResourceReference.java
+++
b/webbeans-spi/src/main/java/org/apache/webbeans/spi/api/ResourceReference.java
@@ -45,12 +45,7 @@ public class ResourceReference<X,T extends Annotation>
implements Serializable
public boolean supports(Class<?> resourceAnnoation)
{
- if(this.annotation.annotationType().equals(resourceAnnoation))
- {
- return true;
- }
-
- return false;
+ return this.annotation.annotationType().equals(resourceAnnoation);
}
public <Y extends Annotation> Y getAnnotation(Class<Y> resourceAnnoation)
diff --git
a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java
b/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java
index 70d3805..ba00ef4 100644
---
a/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java
+++
b/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java
@@ -87,12 +87,7 @@ public class TomcatWebPlugin extends AbstractOwbPlugin
@Override
public boolean supportsJavaEeComponentInjections(Class<?> clazz)
{
- if(isServletSpecClass(clazz))
- {
- return true;
- }
-
- return false;
+ return isServletSpecClass(clazz);
}
private boolean isServletSpecClass(Class<?> clazz)
@@ -124,12 +119,7 @@ public class TomcatWebPlugin extends AbstractOwbPlugin
@Override
public boolean supportService(Class<?> serviceClass)
{
- if(serviceClass.equals(SecurityService.class))
- {
- return true;
- }
-
- return false;
+ return serviceClass.equals(SecurityService.class);
}
}
