1 files changed, 6 insertions, 9 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 1a811ce1b1..6bcf099d2c 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -29,7 +29,7 @@ module ActionDispatch
       end
 
       def generate_sid
-        sid = ActiveSupport::SecureRandom.hex(16)
+        sid = SecureRandom.hex(16)
         sid.encode!('UTF-8') if sid.respond_to?(:encode!)
         sid
       end
@@ -59,7 +59,10 @@ module ActionDispatch
             # Note that the regexp does not allow $1 to end with a ':'
             $1.constantize
           rescue LoadError, NameError => const_error
-            raise ActionDispatch::Session::SessionRestoreError, "Session contains objects whose class definition isn't available.\nRemember to require the classes for all objects kept in the session.\n(Original exception: #{const_error.message} [#{const_error.class}])\n"
+            raise ActionDispatch::Session::SessionRestoreError,
+              "Session contains objects whose class definition isn't available.\n" +
+              "Remember to require the classes for all objects kept in the session.\n" +
+              "(Original exception: #{const_error.message} [#{const_error.class}])\n"
           end
           retry
         else
@@ -73,13 +76,7 @@ module ActionDispatch
       include StaleSessionCheck
 
       def destroy_session(env, sid, options)
-        ActiveSupport::Deprecation.warn "Implementing #destroy in session stores is deprecated. " <<
-          "Please implement destroy_session(env, session_id, options) instead."
-        destroy(env)
-      end
-
-      def destroy(env)
-        raise '#destroy needs to be implemented.'
+        raise '#destroy_session needs to be implemented.'
       end
     end
   end