Session execute_read/write implementation

jruby/neo4j/driver/ext/internal_session.rb

@@ -14,10 +14,20 @@ module InternalSession
         # work around jruby issue https://github.com/jruby/jruby/issues/5603
         Struct.new('Wrapper', :object)
 
-        %i[read write].each do |prefix|
-          define_method("#{prefix}_transaction") do |**config, &block|
-            check do
-              super(->(tx) { Struct::Wrapper.new(reverse_check { block.call(tx) }) }, to_java_config(Neo4j::Driver::TransactionConfig, **config)).object
+        # implementation of read_transaction, write_transaction, execute_read, execute_write
+        %i[read write].each do |mode|
+          ["#{mode}_transaction", "execute_#{mode}"].each do |method_name|
+            define_method(method_name) do |**config, &block|
+              if method_name.include? 'transaction'
+                Neo4j::Driver::Internal::Deprecator.log_warning(method_name, "execute_#{mode}".to_sym, '6.0')
+              end
+
+              check do
+                super(
+                  ->(tx) { Struct::Wrapper.new(reverse_check { block.call(tx) }) },
+                  to_java_config(Neo4j::Driver::TransactionConfig, **config)
+                ).object
+              end
             end
           end
         end

lib/neo4j/driver/internal/deprecator.rb

@@ -0,0 +1,12 @@
+module Neo4j
+  module Driver
+    module Internal
+      module Deprecator
+        def self.log_warning(old_method, new_method, version)
+          @deprecator ||= ActiveSupport::Deprecation.new(version, 'neo4j-ruby-driver')
+          @deprecator.deprecation_warning(old_method, new_method)
+        end
+      end
+    end
+  end
+end

spec/integration/bookmark_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe 'Bookmark' do
   def create_node_in_tx(session)
-    session.write_transaction { |tx| tx.run('CREATE (a:Person)') }
+    session.execute_write { |tx| tx.run('CREATE (a:Person)') }
   end
 
   def preamble(session)
@@ -93,7 +93,7 @@ def expect_single_value(bookmark, value)
   it 'fails on invalid bookmark using tx func' do
     bookmark = Neo4j::Driver::Bookmark.from('hi, this is an invalid bookmark')
     driver.session(bookmarks: bookmark) do |session|
-      expect { session.read_transaction { |tx| tx.run('RETURN 1').single } }
+      expect { session.execute_read { |tx| tx.run('RETURN 1').single } }
         .to raise_error Neo4j::Driver::Exceptions::ClientException do |e|
         expect(e.code).to eq 'Neo.ClientError.Transaction.InvalidBookmark'
       end

spec/integration/causal_clustering_spec.rb

@@ -163,7 +163,7 @@ def new_session(mode)
     create_driver(leader.routing_uri, routing_table_purge_delay: 3.minutes) do |driver|
       database = 'neo4j'
       driver.session(database: database) do |session|
-        session.read_transaction { |tx| tx.run('RETURN 1').consume }
+        session.execute_read { |tx| tx.run('RETURN 1').consume }
       end
       expect(driver.session_factory.connection_provider.routing_table_registry
                    .routing_table_handler(database).routing_table.routers.to_a.size).to eq 3
@@ -181,7 +181,7 @@ def new_session(mode)
         leader.bolt_address,
       ] }) do |driver|
       driver.session do |session|
-        expect(session.read_transaction { |tx| tx.run('RETURN 1').single.first }).to eq 1
+        expect(session.execute_read { |tx| tx.run('RETURN 1').single.first }).to eq 1
       end
     end
   end