Refactor RouteOptionsMessage

Author: hoffmaen

app/messages/route_create_message.rb

@@ -1,4 +1,5 @@
 require 'messages/metadata_base_message'
+require 'messages/route_options_message'
 
 module VCAP::CloudController
   class RouteCreateMessage < MetadataBaseMessage
@@ -68,7 +69,7 @@ def relationships_message
     end
 
     def options_message
-      @options_message ||= RouteOptions.new(options&.deep_symbolize_keys)
+      @options_message ||= RouteOptionsMessage.new(options&.deep_symbolize_keys)
     end
 
     def wildcard?
@@ -91,13 +92,6 @@ def domain_guid
       end
     end
 
-    class RouteOptions < BaseMessage
-      register_allowed_keys %i[lb_algo]
-      validates_with NoAdditionalKeysValidator
-      validates :lb_algo,
-                inclusion: { in: %w[least-connections round-robin], message: "'%<value>s' is not a supported load-balancing algorithm" },
-                presence: true,
-                allow_nil: true
-    end
+
   end
 end

app/messages/route_options_message.rb

@@ -0,0 +1,12 @@
+require 'messages/metadata_base_message'
+
+module VCAP::CloudController
+  class RouteOptionsMessage < BaseMessage
+    register_allowed_keys %i[lb_algo]
+    validates_with NoAdditionalKeysValidator
+    validates :lb_algo,
+              inclusion: { in: %w[least-connections round-robin], message: "'%<value>s' is not a supported load-balancing algorithm" },
+              presence: true,
+              allow_nil: true
+  end
+end

app/messages/route_update_message.rb

@@ -1,4 +1,5 @@
 require 'messages/metadata_base_message'
+require 'messages/route_options_message'
 
 module VCAP::CloudController
   class RouteUpdateMessage < MetadataBaseMessage
@@ -9,21 +10,12 @@ def self.options_requested?
     end
 
     def options_message
-      @options_message ||= RouteOptions.new(options&.deep_symbolize_keys)
+      @options_message ||= RouteOptionsMessage.new(options&.deep_symbolize_keys)
     end
 
     validates_with OptionsValidator, if: options_requested?
 
     validates_with NoAdditionalKeysValidator
 
-    class RouteOptions < BaseMessage
-      register_allowed_keys %i[lb_algo]
-      validates_with NoAdditionalKeysValidator
-      validates :lb_algo,
-                inclusion: { in: %w[least-connections round-robin], message: "'%<value>s' is not a supported load-balancing algorithm" },
-                presence: true,
-                allow_nil: true
-    end
-
   end
 end

spec/unit/messages/validators_spec.rb

@@ -534,7 +534,7 @@ class OptionsMessage < VCAP::CloudController::BaseMessage
         register_allowed_keys [:options]
 
         def options_message
-          VCAP::CloudController::RouteCreateMessage::RouteOptions.new(options&.deep_symbolize_keys)
+          VCAP::CloudController::RouteCreateMessage::RouteOptionsMessage.new(options&.deep_symbolize_keys)
         end
 
         validates_with OptionsValidator