added test case for setting metrics.rollingStats; updated README; rem…

…oved unused code
Netflix · Oct 22, 2014 · 9acbd36 · 9acbd36
1 parent 3d9ef19
commit 9acbd36
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/hystrix-contrib/hystrix-javanica/README.md b/hystrix-contrib/hystrix-javanica/README.md
@@ -208,9 +208,9 @@ ThreadPoolProperties can be set using @HystrixCommand's 'threadPoolProperties' l
                         @HystrixProperty(name = "coreSize", value = "30"),
                         @HystrixProperty(name = "maxQueueSize", value = "101"),
                         @HystrixProperty(name = "keepAliveTimeMinutes", value = "2"),
-                        @HystrixProperty(name = "metricsRollingStatisticalWindowBuckets", value = "12"),
                         @HystrixProperty(name = "queueSizeRejectionThreshold", value = "15"),
-                        @HystrixProperty(name = "metricsRollingStatisticalWindowInMilliseconds", value = "1440")
+                        @HystrixProperty(name = "metrics.rollingStats.numBuckets", value = "12"),
+                        @HystrixProperty(name = "metrics.rollingStats.timeInMilliseconds", value = "1440")
         })
     public User getUserById(String id) {
         return userResource.getUserById(id);

diff --git a/...ica/src/main/java/com/netflix/hystrix/contrib/javanica/conf/HystrixPropertiesManager.java b/...ica/src/main/java/com/netflix/hystrix/contrib/javanica/conf/HystrixPropertiesManager.java
@@ -110,7 +110,6 @@ public static void initializeThreadPoolProperties(HystrixCommand hystrixCommand)
 
         HystrixProperty[] properties = hystrixCommand.threadPoolProperties();
         for(HystrixProperty property : properties) {
-            Integer value = Integer.parseInt(property.value());
             String name = String.format("hystrix.threadpool.%s.%s", threadPoolKey, property.name());
             ConfigurationManager.getConfigInstance().setProperty(name, property.value());
         }

diff --git a/...lix/hystrix/contrib/javanica/test/spring/configuration/command/CommandPropertiesTest.java b/...lix/hystrix/contrib/javanica/test/spring/configuration/command/CommandPropertiesTest.java
@@ -6,11 +6,10 @@
 import com.netflix.hystrix.HystrixThreadPoolProperties;
 import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
 import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
-import com.netflix.hystrix.contrib.javanica.command.AbstractHystrixCommand;
 import com.netflix.hystrix.contrib.javanica.test.spring.conf.AopCglibConfig;
 import com.netflix.hystrix.contrib.javanica.test.spring.domain.User;
 import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext;
-import com.netflix.hystrix.strategy.properties.HystrixPropertiesThreadPoolDefault;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,8 +60,8 @@ public void testGetUser() throws NoSuchFieldException, IllegalAccessException {
             assertEquals(101, (int) properties.maxQueueSize().get());
             assertEquals(2, (int) properties.keepAliveTimeMinutes().get());
             assertEquals(15, (int) properties.queueSizeRejectionThreshold().get());
-            //assertEquals(1440, (int) properties.metricsRollingStatisticalWindowInMilliseconds().get());   // TODO: won't be set. make this work.
-            //assertEquals(12, (int) properties.metricsRollingStatisticalWindowBuckets().get());
+            assertEquals(1440, (int) properties.metricsRollingStatisticalWindowInMilliseconds().get());
+            assertEquals(12, (int) properties.metricsRollingStatisticalWindowBuckets().get());
         } finally {
             context.shutdown();
         }
@@ -97,9 +96,9 @@ public static class UserService {
                         @HystrixProperty(name = "coreSize", value = "30"),
                         @HystrixProperty(name = "maxQueueSize", value = "101"),
                         @HystrixProperty(name = "keepAliveTimeMinutes", value = "2"),
-                        @HystrixProperty(name = "metricsRollingStatisticalWindowBuckets", value = "12"),
+                        @HystrixProperty(name = "metrics.rollingStats.numBuckets", value = "12"),
                         @HystrixProperty(name = "queueSizeRejectionThreshold", value = "15"),
-                        @HystrixProperty(name = "metricsRollingStatisticalWindowInMilliseconds", value = "1440")
+                        @HystrixProperty(name = "metrics.rollingStats.timeInMilliseconds", value = "1440")
                 })
         public User getUser(String id, String name) {
             return new User(id, name + id); // it should be network call