Merge pull request #1572 from dmgcodevil/iss1565

1565: Set maximumSize using @HystrixCommand annotation

Author: mattrjacobs

hystrix-contrib/hystrix-javanica/src/main/java/com/netflix/hystrix/contrib/javanica/conf/HystrixPropertiesManager.java

@@ -79,6 +79,7 @@ private HystrixPropertiesManager() {
      */
     public static final String MAX_QUEUE_SIZE = "maxQueueSize";
     public static final String CORE_SIZE = "coreSize";
+    public static final String MAXIMUM_SIZE = "maximumSize";
     public static final String KEEP_ALIVE_TIME_MINUTES = "keepAliveTimeMinutes";
     public static final String QUEUE_SIZE_REJECTION_THRESHOLD = "queueSizeRejectionThreshold";
     public static final String METRICS_ROLLING_STATS_NUM_BUCKETS = "metrics.rollingStats.numBuckets";
@@ -288,6 +289,13 @@ public void set(HystrixThreadPoolProperties.Setter setter, String value) {
                                 }
                             }
                     )
+                    .put(MAXIMUM_SIZE, new PropSetter<HystrixThreadPoolProperties.Setter, String>() {
+                                @Override
+                                public void set(HystrixThreadPoolProperties.Setter setter, String value) {
+                                    setter.withMaximumSize(toInt(MAXIMUM_SIZE, value));
+                                }
+                            }
+                    )
                     .put(KEEP_ALIVE_TIME_MINUTES, new PropSetter<HystrixThreadPoolProperties.Setter, String>() {
                                 @Override
                                 public void set(HystrixThreadPoolProperties.Setter setter, String value) {

hystrix-contrib/hystrix-javanica/src/test/java/com/netflix/hystrix/contrib/javanica/test/common/configuration/command/BasicCommandPropertiesTest.java

@@ -84,6 +84,7 @@ public void testGetUser() throws NoSuchFieldException, IllegalAccessException {
         HystrixThreadPoolProperties properties = getThreadPoolProperties(command);
 
         assertEquals(30, (int) properties.coreSize().get());
+        assertEquals(25, (int) properties.maximumSize().get());
         assertEquals(101, (int) properties.maxQueueSize().get());
         assertEquals(2, (int) properties.keepAliveTimeMinutes().get());
         assertEquals(15, (int) properties.queueSizeRejectionThreshold().get());
@@ -159,6 +160,7 @@ public static class UserService {
                 },
                 threadPoolProperties = {
                         @HystrixProperty(name = "coreSize", value = "30"),
+                        @HystrixProperty(name = "maximumSize", value = "25"),
                         @HystrixProperty(name = "maxQueueSize", value = "101"),
                         @HystrixProperty(name = "keepAliveTimeMinutes", value = "2"),
                         @HystrixProperty(name = "metrics.rollingStats.numBuckets", value = "12"),