refactor: remove unnecessary code (apache#1490)

slievrly · Aug 20, 2019 · dd04c87 · dd04c87
1 parent f61382a
commit dd04c87
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/config/seata-config-consul/src/main/java/io/seata/config/consul/ConsulConfiguration.java b/config/seata-config-consul/src/main/java/io/seata/config/consul/ConsulConfiguration.java
@@ -207,12 +207,12 @@ private static ConsulClient getConsulClient() {
      * @param configFuture
      */
     private void complete(Response response, ConfigFuture configFuture) {
-        Object value = response.getValue();
-        if (null != response && null != value) {
+        if (null != response && null != response.getValue()) {
+            Object value = response.getValue();
             if (value instanceof GetValue) {
-                configFuture.setResult(((GetValue) response.getValue()).getDecodedValue());
+                configFuture.setResult(((GetValue) value).getDecodedValue());
             } else {
-                configFuture.setResult(response.getValue());
+                configFuture.setResult(value);
             }
         }
     }

diff --git a/config/seata-config-core/src/main/java/io/seata/config/AbstractConfiguration.java b/config/seata-config-core/src/main/java/io/seata/config/AbstractConfiguration.java
@@ -94,7 +94,7 @@ public Duration getDuration(String dataId, Duration defaultValue) {
 
     @Override
     public Duration getDuration(String dataId, Duration defaultValue, long timeoutMills) {
-        String result = getConfig(dataId, String.valueOf(defaultValue.toMillis() + "ms"), timeoutMills);
+        String result = getConfig(dataId, defaultValue.toMillis() + "ms", timeoutMills);
         return DurationUtil.parse(result);
     }
 

diff --git a/config/seata-config-core/src/main/java/io/seata/config/ConfigFuture.java b/config/seata-config-core/src/main/java/io/seata/config/ConfigFuture.java
@@ -77,7 +77,6 @@ public boolean isTimeout() {
      * Get object.
      *
      * @return the object
-     * @throws InterruptedException the interrupted exception
      */
     public Object get() {
         return get(this.timeoutMills, TimeUnit.MILLISECONDS);
@@ -89,7 +88,6 @@ public Object get() {
      * @param timeout the timeout
      * @param unit    the unit
      * @return the object
-     * @throws InterruptedException the interrupted exception
      */
     public Object get(long timeout, TimeUnit unit) {
         this.timeoutMills = unit.toMillis(timeout);

diff --git a/config/seata-config-nacos/src/main/java/io/seata/config/nacos/NacosConfiguration.java b/config/seata-config-nacos/src/main/java/io/seata/config/nacos/NacosConfiguration.java
@@ -86,7 +86,6 @@ public String getConfig(String dataId, String defaultValue, long timeoutMills) {
             value = configService.getConfig(dataId, SEATA_GROUP, timeoutMills);
         } catch (NacosException exx) {
             LOGGER.error(exx.getErrMsg());
-            value = defaultValue;
         }
         return value == null ? defaultValue : value;
     }

diff --git a/config/seata-config-zk/src/main/java/io/seata/config/zk/ZookeeperConfiguration.java b/config/seata-config-zk/src/main/java/io/seata/config/zk/ZookeeperConfiguration.java
@@ -90,13 +90,10 @@ public String getConfig(String dataId, String defaultValue, long timeoutMills) {
         }
         FutureTask<String> future = new FutureTask<String>(new Callable<String>() {
             @Override
-            public String call() throws Exception {
+            public String call() {
                 String path = ROOT_PATH + ZK_PATH_SPLIT_CHAR + dataId;
                 String value = zkClient.readData(path);
-                if (StringUtils.isNullOrEmpty(value)) {
-                    return defaultValue;
-                }
-                return value;
+                return StringUtils.isNullOrEmpty(value) ? defaultValue : value;
             }
         });
         CONFIG_EXECUTOR.execute(future);
@@ -112,7 +109,7 @@ public String call() throws Exception {
     public boolean putConfig(String dataId, String content, long timeoutMills) {
         FutureTask<Boolean> future = new FutureTask<Boolean>(new Callable<Boolean>() {
             @Override
-            public Boolean call() throws Exception {
+            public Boolean call() {
                 String path = ROOT_PATH + ZK_PATH_SPLIT_CHAR + dataId;
                 if (!zkClient.exists(path)) {
                     zkClient.create(path, content, CreateMode.PERSISTENT);
@@ -140,7 +137,7 @@ public boolean putConfigIfAbsent(String dataId, String content, long timeoutMill
     public boolean removeConfig(String dataId, long timeoutMills) {
         FutureTask<Boolean> future = new FutureTask<Boolean>(new Callable<Boolean>() {
             @Override
-            public Boolean call() throws Exception {
+            public Boolean call() {
                 String path = ROOT_PATH + ZK_PATH_SPLIT_CHAR + dataId;
                 return zkClient.delete(path);
             }