EUCA-7686 added some listeners with type checking for webservice prop…

…erties
eucalyptus · Mar 26, 2014 · cdf71a0 · cdf71a0
1 parent f08765b
commit cdf71a0
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 16 deletions.
diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/StackConfiguration.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/StackConfiguration.java
@@ -89,7 +89,7 @@
 public class StackConfiguration extends AbstractPersistent {
 
   @ConfigurableField( description = "Channel connect timeout (ms).",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckNonNegativeIntegerAndRestartWebServicesListener.class )
   public static Integer       CHANNEL_CONNECT_TIMEOUT           = 500;
   @ConfigurableField( changeListener = TimeChangeListener.class,
                       description = "Time interval duration (in seconds) during which duplicate signatures will be accepted to accomodate collisions for legitimate requests inherent in Query/REST signing protocol." )
@@ -98,52 +98,52 @@ public class StackConfiguration extends AbstractPersistent {
                       changeListener = TimeChangeListener.class )
   public static Integer       CLOCK_SKEW_SEC                    = 20;
   @ConfigurableField( description = "Server socket reuse address.",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckBooleanAndRestartWebServicesListener.class )
   public static final Boolean SERVER_CHANNEL_REUSE_ADDRESS      = true;
   @ConfigurableField( description = "Server socket TCP_NODELAY.",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckBooleanAndRestartWebServicesListener.class )
   public static final Boolean SERVER_CHANNEL_NODELAY            = true;
   @ConfigurableField( description = "Socket reuse address.",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckBooleanAndRestartWebServicesListener.class )
   public static final Boolean CHANNEL_REUSE_ADDRESS             = true;
   @ConfigurableField( description = "Socket keep alive.",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckBooleanAndRestartWebServicesListener.class )
   public static final Boolean CHANNEL_KEEP_ALIVE                = true;
   @ConfigurableField( description = "Server socket TCP_NODELAY.",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckBooleanAndRestartWebServicesListener.class )
   public static final Boolean CHANNEL_NODELAY                   = true;
   @ConfigurableField( description = "Server worker thread pool max.",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckNonNegativeIntegerAndRestartWebServicesListener.class )
   public static Integer       SERVER_POOL_MAX_THREADS           = 128;
   @ConfigurableField( description = "Server max worker memory per connection.",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckNonNegativeLongAndRestartWebServicesListener.class )
   public static Long          SERVER_POOL_MAX_MEM_PER_CONN      = 0L;
   @ConfigurableField( description = "Server max worker memory total.",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckNonNegativeIntegerAndRestartWebServicesListener.class )
   public static Long          SERVER_POOL_TOTAL_MEM             = 0L;
 
   @ConfigurableField( description = "Service socket select timeout (ms).",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckNonNegativeLongAndRestartWebServicesListener.class )
   public static Long          SERVER_POOL_TIMEOUT_MILLIS        = 500L;
 
   @ConfigurableField( description = "Server selector thread pool max.",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckNonNegativeIntegerAndRestartWebServicesListener.class )
   public static Integer       SERVER_BOSS_POOL_MAX_THREADS      = 128;
 
   @ConfigurableField( description = "Server max selector memory per connection.",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckNonNegativeLongAndRestartWebServicesListener.class )
   public static Long          SERVER_BOSS_POOL_MAX_MEM_PER_CONN = 0L;
 
   @ConfigurableField( description = "Server worker thread pool max.",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckNonNegativeLongAndRestartWebServicesListener.class )
   public static Long          SERVER_BOSS_POOL_TOTAL_MEM        = 0L;
 
   @ConfigurableField( description = "Service socket select timeout (ms).",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckNonNegativeLongAndRestartWebServicesListener.class )
   public static Long          SERVER_BOSS_POOL_TIMEOUT_MILLIS   = 500L;
 
   @ConfigurableField( description = "Port to bind (note: port 8773 is always bound regardless).",
-                      changeListener = WebServices.RestartWebServicesListener.class )
+                      changeListener = WebServices.CheckNonNegativeIntegerAndRestartWebServicesListener.class )
   public static Integer       PORT                              = 8773;
   public static final Integer INTERNAL_PORT                     = 8773;
 

diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/ws/WebServices.java b/clc/modules/msgs/src/main/java/com/eucalyptus/ws/WebServices.java
@@ -156,7 +156,50 @@ public void fireChange( ConfigurableProperty t, Object newValue ) throws Configu
     }
 
   }
-
+
+  public static class CheckNonNegativeIntegerAndRestartWebServicesListener implements PropertyChangeListener {
+    @Override
+    public void fireChange( ConfigurableProperty t, Object newValue ) throws ConfigurablePropertyException {
+      int value = -1;
+      try {
+        value = Integer.parseInt((String) newValue);
+      } catch (Exception ex) {
+        throw new ConfigurablePropertyException("Invalid value " + newValue);
+      }
+      if (value < 0) {
+        throw new ConfigurablePropertyException("Invalid value " + newValue);
+      }
+      new RestartWebServicesListener().fireChange(t, newValue);
+    }
+  }
+
+  public static class CheckNonNegativeLongAndRestartWebServicesListener implements PropertyChangeListener {
+    @Override
+    public void fireChange( ConfigurableProperty t, Object newValue ) throws ConfigurablePropertyException {
+      long value = -1;
+      try {
+        value = Long.parseLong((String) newValue);
+      } catch (Exception ex) {
+        throw new ConfigurablePropertyException("Invalid value " + newValue);
+      }
+      if (value < 0) {
+        throw new ConfigurablePropertyException("Invalid value " + newValue);
+      }
+      new RestartWebServicesListener().fireChange(t, newValue);
+    }
+  }
+
+  public static class CheckBooleanAndRestartWebServicesListener implements PropertyChangeListener {
+    @Override
+    public void fireChange( ConfigurableProperty t, Object newValue ) throws ConfigurablePropertyException {
+      if ((newValue == null) || (!((String) newValue).equalsIgnoreCase("true") && !((String) newValue).equalsIgnoreCase("false"))) {
+        throw new ConfigurablePropertyException("Invalid value " + newValue);
+      }
+      new RestartWebServicesListener().fireChange(t, newValue);
+    }
+  }
+
+
   private static Logger   LOG = Logger.getLogger( WebServices.class );
   private static Executor clientWorkerThreadPool;
   private static NioClientSocketChannelFactory nioClientSocketChannelFactory;
@@ -456,4 +499,5 @@ private static Executor workerPool( ) {
                                                                           TimeUnit.MILLISECONDS );
     return workerPool;
   }
+
 }