[incubator-dubbo] branch master updated: Optimization unnecessary unboxing 'b.booleanValue()' and Remove invalid throws java.lang.Exception (#2529)

[jerrick]

This is an automated email from the ASF dual-hosted git repository.

jerrick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/master by this push:
     new 4776efb  Optimization unnecessary unboxing 'b.booleanValue()' and 
Remove invalid  throws java.lang.Exception (#2529)
4776efb is described below

commit 4776efba344514111a763ea871cd8149ca51a9ae
Author: Alex <chenlushu...@163.com>
AuthorDate: Fri Sep 21 10:13:36 2018 +0800

    Optimization unnecessary unboxing 'b.booleanValue()' and Remove invalid  
throws java.lang.Exception (#2529)
    
    * Condition  applicationContext != null is always true
    
    * optimization of code
---
 .../apache/dubbo/config/spring/ReferenceBean.java    | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git 
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
 
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
index e6a2a1f..bd6195c 100644
--- 
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
+++ 
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java
@@ -38,8 +38,6 @@ import java.util.Map;
 
 /**
  * ReferenceFactoryBean
- *
- * @export
  */
 public class ReferenceBean<T> extends ReferenceConfig<T> implements 
FactoryBean, ApplicationContextAware, InitializingBean, DisposableBean {
 
@@ -62,7 +60,7 @@ public class ReferenceBean<T> extends ReferenceConfig<T> 
implements FactoryBean,
     }
 
     @Override
-    public Object getObject() throws Exception {
+    public Object getObject() {
         return get();
     }
 
@@ -85,7 +83,7 @@ public class ReferenceBean<T> extends ReferenceConfig<T> 
implements FactoryBean,
             if (consumerConfigMap != null && consumerConfigMap.size() > 0) {
                 ConsumerConfig consumerConfig = null;
                 for (ConsumerConfig config : consumerConfigMap.values()) {
-                    if (config.isDefault() == null || 
config.isDefault().booleanValue()) {
+                    if (config.isDefault() == null || config.isDefault()) {
                         if (consumerConfig != null) {
                             throw new IllegalStateException("Duplicate 
consumer configs: " + consumerConfig + " and " + config);
                         }
@@ -103,7 +101,7 @@ public class ReferenceBean<T> extends ReferenceConfig<T> 
implements FactoryBean,
             if (applicationConfigMap != null && applicationConfigMap.size() > 
0) {
                 ApplicationConfig applicationConfig = null;
                 for (ApplicationConfig config : applicationConfigMap.values()) 
{
-                    if (config.isDefault() == null || 
config.isDefault().booleanValue()) {
+                    if (config.isDefault() == null || config.isDefault()) {
                         if (applicationConfig != null) {
                             throw new IllegalStateException("Duplicate 
application configs: " + applicationConfig + " and " + config);
                         }
@@ -121,7 +119,7 @@ public class ReferenceBean<T> extends ReferenceConfig<T> 
implements FactoryBean,
             if (moduleConfigMap != null && moduleConfigMap.size() > 0) {
                 ModuleConfig moduleConfig = null;
                 for (ModuleConfig config : moduleConfigMap.values()) {
-                    if (config.isDefault() == null || 
config.isDefault().booleanValue()) {
+                    if (config.isDefault() == null || config.isDefault()) {
                         if (moduleConfig != null) {
                             throw new IllegalStateException("Duplicate module 
configs: " + moduleConfig + " and " + config);
                         }
@@ -138,13 +136,13 @@ public class ReferenceBean<T> extends ReferenceConfig<T> 
implements FactoryBean,
                 && (getApplication() == null || 
getApplication().getRegistries() == null || 
getApplication().getRegistries().isEmpty())) {
             Map<String, RegistryConfig> registryConfigMap = applicationContext 
== null ? null : 
BeanFactoryUtils.beansOfTypeIncludingAncestors(applicationContext, 
RegistryConfig.class, false, false);
             if (registryConfigMap != null && registryConfigMap.size() > 0) {
-                List<RegistryConfig> registryConfigs = new 
ArrayList<RegistryConfig>();
+                List<RegistryConfig> registryConfigs = new ArrayList<>();
                 for (RegistryConfig config : registryConfigMap.values()) {
-                    if (config.isDefault() == null || 
config.isDefault().booleanValue()) {
+                    if (config.isDefault() == null || config.isDefault()) {
                         registryConfigs.add(config);
                     }
                 }
-                if (registryConfigs != null && !registryConfigs.isEmpty()) {
+                if (!registryConfigs.isEmpty()) {
                     super.setRegistries(registryConfigs);
                 }
             }
@@ -156,7 +154,7 @@ public class ReferenceBean<T> extends ReferenceConfig<T> 
implements FactoryBean,
             if (monitorConfigMap != null && monitorConfigMap.size() > 0) {
                 MonitorConfig monitorConfig = null;
                 for (MonitorConfig config : monitorConfigMap.values()) {
-                    if (config.isDefault() == null || 
config.isDefault().booleanValue()) {
+                    if (config.isDefault() == null || config.isDefault()) {
                         if (monitorConfig != null) {
                             throw new IllegalStateException("Duplicate monitor 
configs: " + monitorConfig + " and " + config);
                         }
@@ -172,7 +170,7 @@ public class ReferenceBean<T> extends ReferenceConfig<T> 
implements FactoryBean,
         if (b == null && getConsumer() != null) {
             b = getConsumer().isInit();
         }
-        if (b != null && b.booleanValue()) {
+        if (b != null && b) {
             getObject();
         }
     }