fixes #2380 branch 1.6.x update consul code format

Author: stevehu

consul/src/main/java/com/networknt/consul/ConsulConstants.java

@@ -57,12 +57,12 @@ public class ConsulConstants {
 	 * Heart beat circle，2/3 of ttl
 	 */
 	public static int HEARTBEAT_CIRCLE = (TTL * 1000 * 2) / 3;
-	
+
 	/**
 	 * Maximum continuous switch checks, send heart beat is this number is exceeded.
 	 */
 	public static int MAX_SWITCHER_CHECK_TIMES = 10;
-	
+
 	/**
 	 * Switcher change rate
 	 */
@@ -83,7 +83,7 @@ public class ConsulConstants {
 	 * consul block, max block time in minute
 	 */
 	public static int CONSUL_BLOCK_TIME_MINUTES = 10;
-	
+
 	/**
 	 * consul block max block time in second
 	 */

consul/src/main/java/com/networknt/consul/ConsulHeartbeatManager.java

@@ -16,25 +16,20 @@
 
 package com.networknt.consul;
 
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.Executors;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
 import com.networknt.consul.client.ConsulClient;
 import com.networknt.utility.ConcurrentHashSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.*;
+
 /**
  * consul heart beat manager. passing status service id is registered here，
  * and this class will set passing status for serviceId（in fact it is corresponding checkId of serviceId),
  * then the heart beat process is done.
  *
  * Switcher is used to enable heart beat or disable heart beat.
- * 
+ *
  * @author zhanglei
  *
  */
@@ -98,7 +93,7 @@ public void run() {
 	/**
 	 * check heart beat switcher status, if switcher is changed, then change lastHeartBeatSwitcherStatus
 	 * to the latest status.
-	 * 
+	 *
 	 * @param switcherStatus
 	 * @return
 	 */
@@ -131,7 +126,7 @@ public void close() {
 
 	/**
 	 * Add consul serviceId，added serviceId will set passing status to keep sending heart beat.
-	 * 
+	 *
 	 * @param serviceId service Id
 	 */
 	public void addHeartbeatServcieId(String serviceId) {
@@ -140,7 +135,7 @@ public void addHeartbeatServcieId(String serviceId) {
 
 	/**
 	 * remove serviceId，corresponding serviceId won't send heart beat
-	 * 
+	 *
 	 * @param serviceId service Id
 	 */
 	public void removeHeartbeatServiceId(String serviceId) {

consul/src/main/java/com/networknt/consul/ConsulResponse.java

@@ -21,11 +21,11 @@ public class ConsulResponse<T> {
 	 * consul return result
 	 */
 	private T value;
-	
+
 	private Long consulIndex;
-	
+
 	private Boolean consulKnownLeader;
-	
+
 	private Long consulLastContact;
 
 	public T getValue() {
@@ -60,5 +60,4 @@ public void setConsulLastContact(Long consulLastContact) {
 		this.consulLastContact = consulLastContact;
 	}
 
-	
 }

consul/src/main/java/com/networknt/consul/ConsulService.java

@@ -37,7 +37,7 @@ public class ConsulService {
 	private Integer port;
 
 	private String checkString;
-	
+
 	public String getId() {
 		return id;
 	}

consul/src/main/java/com/networknt/consul/ConsulUtils.java

@@ -193,5 +193,4 @@ public static int getTimeoutBufferInSecond(String timeoutBuffer) {
         }
         return w;
     }
-
 }

consul/src/main/java/com/networknt/consul/client/ConsulClient.java

@@ -16,11 +16,11 @@
 
 package com.networknt.consul.client;
 
-import java.util.List;
-
 import com.networknt.consul.ConsulResponse;
 import com.networknt.consul.ConsulService;
 
+import java.util.List;
+
 public interface ConsulClient {
 
 	/**

consul/src/test/java/com/networknt/consul/ConsulClientImplTest.java

@@ -17,7 +17,6 @@
 package com.networknt.consul;
 
 import com.networknt.config.Config;
-import com.networknt.consul.client.ConsulClientImpl;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

consul/src/test/java/com/networknt/consul/ConsulHeartbeatManagerTest.java

@@ -16,18 +16,18 @@
 
 package com.networknt.consul;
 
-import static org.junit.Assert.assertTrue;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertTrue;
 
 /**
- * 
+ *
  * @Description ConsulHeartbeatManagerTest
  * @author zhanglei28
  *

consul/src/test/java/com/networknt/consul/MockUtils.java

@@ -16,9 +16,8 @@
 
 package com.networknt.consul;
 
-import com.networknt.registry.URLImpl;
-import com.networknt.registry.URLParamType;
 import com.networknt.registry.URL;
+import com.networknt.registry.URLImpl;
 
 import java.util.ArrayList;
 import java.util.HashMap;

consul/src/test/resources/config/consul.yml

@@ -25,5 +25,6 @@ ttlCheck: true
 # respectively).
 wait: 600s
 # Time in seconds between blocking queries with Consul
-# Consul blocking queries time should be set via the 'lookupInterval' parameter in consul.yml, instead of 'registrySessionTimeout' in service.yml
+# Consul blocking queries time should be set via the 'lookupInterval' parameter in consul.yml, instead of 
+# 'registrySessionTimeout' in service.yml
 lookupInterval: 30