cleanup: revert unwanted changes

Author: a18e

Gemfile.lock

@@ -285,7 +285,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jaro_winkler (1.5.6)
-    json (2.7.5)
+    json (2.7.4)
     json-diff (0.4.1)
     json-schema (5.0.1)
       addressable (~> 2.8)

app/actions/manifest_route_update.rb

@@ -58,7 +58,6 @@ def update(app_guid, message, user_audit_info)
 
       private
 
-      ## TODO: We also need to update when the route options differ
       def find_or_create_valid_route(app, manifest_route, user_audit_info)
         manifest_route[:candidate_host_domain_pairs].each do |candidate|
           potential_domain = candidate[:domain]

app/models/runtime/route.rb

@@ -5,7 +5,6 @@
 require 'actions/services/route_binding_delete'
 
 module VCAP::CloudController
-
   class Route < Sequel::Model
     class InvalidOrganizationRelation < CloudController::Errors::InvalidRelation; end
 
@@ -21,12 +20,12 @@ class OutOfVIPException < CloudController::Errors::InvalidRelation; end
 
     # TODO: apps are actually processes
     many_to_many :apps, class: 'VCAP::CloudController::ProcessModel',
-                 join_table: RouteMappingModel.table_name,
-                 left_primary_key: :guid, left_key: :route_guid,
-                 right_primary_key: %i[app_guid type], right_key: %i[app_guid process_type],
-                 distinct: true,
-                 order: Sequel.asc(:id),
-                 conditions: { type: ProcessTypes::WEB }
+                        join_table: RouteMappingModel.table_name,
+                        left_primary_key: :guid, left_key: :route_guid,
+                        right_primary_key: %i[app_guid type], right_key: %i[app_guid process_type],
+                        distinct: true,
+                        order: Sequel.asc(:id),
+                        conditions: { type: ProcessTypes::WEB }
 
     many_to_many :shared_spaces,
                  left_key: :route_guid,
@@ -90,7 +89,6 @@ def options_with_serialization
     alias_method :options, :options_with_serialization
 
     alias_method :old_path, :path
-
     def path
       old_path.nil? ? '' : old_path
     end
@@ -179,8 +177,8 @@ def domains_match?
 
     def validate_changed_space(new_space)
       raise CloudController::Errors::InvalidAppRelation.new('Route and apps not in same space') if !FeatureFlag.enabled?(:route_sharing) && apps.any? do |app|
-        app.space.id != space.id
-      end
+                                                                                                     app.space.id != space.id
+                                                                                                   end
       raise InvalidOrganizationRelation.new("Organization cannot use domain #{domain.name}") if domain && !domain.usable_by_organization?(new_space.organization)
     end
 
@@ -238,8 +236,8 @@ def find_next_vip_offset
       # See SQL self-joins for the reasoning behind this
 
       n = Route.exclude(vip_offset: 1).
-        exclude { vip_offset - 1 =~ Route.select(:vip_offset) }.order(:vip_offset).get { vip_offset - 1 } ||
-        (return (Route.max(:vip_offset) || 0) + 1)
+          exclude { vip_offset - 1 =~ Route.select(:vip_offset) }.order(:vip_offset).get { vip_offset - 1 } ||
+          (return (Route.max(:vip_offset) || 0) + 1)
       Route.where { vip_offset < n }.reverse(:vip_offset).get { vip_offset + 1 } || 1
     end
 
@@ -258,9 +256,9 @@ def internal_route_vip_range_len
 
     def internal_route_vip_range
       @internal_route_vip_range ||= begin
-                                      internal_route_vip_range = Config.config.get(:internal_route_vip_range)
-                                      NetAddr::IPv4Net.parse(internal_route_vip_range)
-                                    end
+        internal_route_vip_range = Config.config.get(:internal_route_vip_range)
+        NetAddr::IPv4Net.parse(internal_route_vip_range)
+      end
     end
 
     def destroy_route_bindings
@@ -326,7 +324,7 @@ def validate_total_routes
       return unless new? && space
 
       space_routes_policy = MaxRoutesPolicy.new(space.space_quota_definition, SpaceRoutes.new(space))
-      org_routes_policy = MaxRoutesPolicy.new(space.organization.quota_definition, OrganizationRoutes.new(space.organization))
+      org_routes_policy   = MaxRoutesPolicy.new(space.organization.quota_definition, OrganizationRoutes.new(space.organization))
 
       errors.add(:space, :total_routes_exceeded) if space.space_quota_definition && !space_routes_policy.allow_more_routes?(1)