From 67a91cf6f94e8e98c265461bc9a722e09d9bbedb Mon Sep 17 00:00:00 2001 From: igor-suhorukov Date: Sun, 25 Feb 2018 01:04:14 +0300 Subject: [PATCH] Polish: redundant pairs of parentheses should be removed --- .../beans/factory/support/DefaultListableBeanFactory.java | 2 +- .../beans/factory/xml/BeanDefinitionParserDelegate.java | 4 ++-- .../main/java/org/springframework/core/ResolvableType.java | 2 +- .../java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java index bac78d02ec..16913575e1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java @@ -414,7 +414,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName); // Only check bean definition if it is complete. if (!mbd.isAbstract() && (allowEagerInit || - ((mbd.hasBeanClass() || !mbd.isLazyInit() || isAllowEagerClassLoading())) && + (mbd.hasBeanClass() || !mbd.isLazyInit() || isAllowEagerClassLoading()) && !requiresEagerInitForType(mbd.getFactoryBeanName()))) { // In case of FactoryBean, match object created by FactoryBean. boolean isFactoryBean = isFactoryBean(beanName, mbd); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java index 357c67f3b0..7bdce34d6f 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java @@ -1202,7 +1202,7 @@ public class BeanDefinitionParserDelegate { boolean hasKeyAttribute = entryEle.hasAttribute(KEY_ATTRIBUTE); boolean hasKeyRefAttribute = entryEle.hasAttribute(KEY_REF_ATTRIBUTE); if ((hasKeyAttribute && hasKeyRefAttribute) || - ((hasKeyAttribute || hasKeyRefAttribute)) && keyEle != null) { + (hasKeyAttribute || hasKeyRefAttribute) && keyEle != null) { error(" element is only allowed to contain either " + "a 'key' attribute OR a 'key-ref' attribute OR a sub-element", entryEle); } @@ -1231,7 +1231,7 @@ public class BeanDefinitionParserDelegate { boolean hasValueRefAttribute = entryEle.hasAttribute(VALUE_REF_ATTRIBUTE); boolean hasValueTypeAttribute = entryEle.hasAttribute(VALUE_TYPE_ATTRIBUTE); if ((hasValueAttribute && hasValueRefAttribute) || - ((hasValueAttribute || hasValueRefAttribute)) && valueEle != null) { + (hasValueAttribute || hasValueRefAttribute) && valueEle != null) { error(" element is only allowed to contain either " + "'value' attribute OR 'value-ref' attribute OR sub-element", entryEle); } diff --git a/spring-core/src/main/java/org/springframework/core/ResolvableType.java b/spring-core/src/main/java/org/springframework/core/ResolvableType.java index aecd76a7af..26ff5ef039 100644 --- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java +++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java @@ -365,7 +365,7 @@ public class ResolvableType implements Serializable { if (this == NONE) { return false; } - return (((this.type instanceof Class && ((Class) this.type).isArray())) || + return ((this.type instanceof Class && ((Class) this.type).isArray()) || this.type instanceof GenericArrayType || resolveType().isArray()); } diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java index d83a9d51c5..ca4edecde3 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java @@ -607,7 +607,7 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi Type typeArgument = parameterizedType.getActualTypeArguments()[0]; if (typeArgument instanceof Class) { Class classArgument = (Class) typeArgument; - return (((classArgument.isArray() && Byte.TYPE == classArgument.getComponentType())) || + return ((classArgument.isArray() && Byte.TYPE == classArgument.getComponentType()) || isPrimitiveWrapper(classArgument) || isStandardClass(classArgument) || supportsInternal(classArgument, false)); }