From 1d7e6548d2ba97734a4037d9e4ceb41a48860a56 Mon Sep 17 00:00:00 2001 From: gandrianakis Date: Fri, 10 Jul 2015 10:27:47 +0300 Subject: [PATCH] Minor changes indicated by code inspection --- .../springframework/cloud/consul/bus/EventService.java | 3 +-- .../cloud/consul/config/ConsulPropertySource.java | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/spring-cloud-consul-bus/src/main/java/org/springframework/cloud/consul/bus/EventService.java b/spring-cloud-consul-bus/src/main/java/org/springframework/cloud/consul/bus/EventService.java index a0ba793c..24e3cad4 100644 --- a/spring-cloud-consul-bus/src/main/java/org/springframework/cloud/consul/bus/EventService.java +++ b/spring-cloud-consul-bus/src/main/java/org/springframework/cloud/consul/bus/EventService.java @@ -93,8 +93,7 @@ public class EventService { String upper = eventId.substring(19, 23) + eventId.substring(24, 36); BigInteger lowVal = new BigInteger(lower, 16); BigInteger highVal = new BigInteger(upper, 16); - BigInteger index = lowVal.xor(highVal); - return index; + return lowVal.xor(highVal); } public List getEvents(BigInteger lastIndex) { diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java index b967bc0b..2df1d3ad 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulPropertySource.java @@ -21,13 +21,15 @@ import static org.springframework.util.Base64Utils.decodeFromString; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; + +import org.springframework.core.env.EnumerablePropertySource; +import org.springframework.util.StringUtils; import com.ecwid.consul.v1.ConsulClient; import com.ecwid.consul.v1.QueryParams; import com.ecwid.consul.v1.Response; import com.ecwid.consul.v1.kv.model.GetValue; -import org.springframework.core.env.EnumerablePropertySource; -import org.springframework.util.StringUtils; /** * @author Spencer Gibb @@ -77,6 +79,7 @@ public class ConsulPropertySource extends EnumerablePropertySource @Override public String[] getPropertyNames() { - return properties.keySet().toArray(new String[0]); + Set strings = properties.keySet(); + return strings.toArray(new String[strings.size()]); } }