Update UPGRADING notes regarding return usage and simplify block calling in endpoint.

Author: ericproulx

UPGRADING.md

@@ -23,7 +23,7 @@ See [#2617](https://github.com/ruby-grape/grape/pull/2617) for more information.
 
 #### Endpoint execution simplified and `return` deprecated
 
-Executing a endpoint's block has been simplified and calling `return` in it has been deprecated.
+Executing a endpoint's block has been simplified and calling `return` in it has been deprecated. Use `next` instead.
 
 See [#2577](https://github.com/ruby-grape/grape/pull/2577) for more information.
 

lib/grape/endpoint.rb

@@ -71,24 +71,10 @@ def initialize(new_settings, options = {}, &block)
 
       @lazy_initialize_lock = Mutex.new
       @lazy_initialized = nil
-      @block = nil
-
       @status = nil
       @stream = nil
       @body = nil
-
-      if block
-        @source = block
-        @block = lambda do |endpoint_instance|
-          ActiveSupport::Notifications.instrument('endpoint_render.grape', endpoint: endpoint_instance) do
-            endpoint_instance.instance_exec(&block)
-          rescue LocalJumpError => e
-            Grape.deprecator.warn 'Using `return` in an endpoint has been deprecated.'
-            return e.exit_value
-          end
-        end
-      end
-
+      @source = block
       @helpers = build_helpers
     end
 
@@ -255,7 +241,14 @@ def run
     end
 
     def execute
-      @block&.call(self)
+      return unless @source
+
+      ActiveSupport::Notifications.instrument('endpoint_render.grape', endpoint: self) do
+        instance_exec(&@source)
+      rescue LocalJumpError => e
+        Grape.deprecator.warn 'Using `return` in an endpoint has been deprecated. Use `next` instead'
+        return e.exit_value
+      end
     end
 
     def lazy_initialize!

spec/grape/endpoint_spec.rb

@@ -776,7 +776,7 @@ def memoized
       return 'Hello'
     end
 
-    expect(Grape.deprecator).to receive(:warn).with('Using `return` in an endpoint has been deprecated.')
+    expect(Grape.deprecator).to receive(:warn).with('Using `return` in an endpoint has been deprecated. Use `next` instead')
 
     get '/home'
     expect(last_response.status).to eq(200)