neo4j-ruby-driver 5.7.0.alpha.5 → 5.7.0.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94eddb6ca44c911e72bc498048e91e3f3200147c67fe10b3a828d14ecce2bf7f
-  data.tar.gz: fcc696515c9fb11bd4581cb057b875e727e81cc0e61f0b688adbf3b4da1930a7
+  metadata.gz: 8155401c9cf866b2f2595fdd1334c35c0d09b3160f9b7c9e1c94aef334ad66e5
+  data.tar.gz: 1e4ba8da99822dfb02dbc6f2088c478e1868592b387d9b6acef954f6973a6cd8
 SHA512:
-  metadata.gz: d20a99580348b5313e5854cc6501dce13f0c09d92232faac3004b330cc64a97574d5b6ff0ff979ab24bc4c635e05b6c503ed901eb57d8f08469bec461e6a8528
-  data.tar.gz: 4e0da2ae6afefb5590752642c7a707071ac6f09c1f15492d5e31afaa88f084ff1ebd88a619d1a64ae4dd91ef0c1ddbf49754f3a73fed0a59ef305d87a98186f0
+  metadata.gz: 814db07fdb74c015051783ea1a91db4db2db5a3c715f0a8ce27d83ba726e58af930af4f8470ef67afeb40392499cfdda0b3230a14cecbb3d2f4fbe2dbd1db496
+  data.tar.gz: df14e459b0e08839b105e95f7ca3a4ed7a08c021bd95cfa7ada04aae8c5e7b01383014f808b0c11d0d90e35eba6973adfb612273b32e1ecfbf1c88fb19d54528

data/lib/neo4j/driver/exceptions/neo4j_exception.rb

@@ -7,14 +7,14 @@ module Neo4j
         attr_reader :code, :suppressed
 
         def initialize(*args)
-          @code = args.shift if args.count > 1
-          message = args.shift
-          @suppressed = args.shift
-          super(message)
+          args, exceptions = args.partition { |arg| arg.is_a?(String) }
+          super(args.pop)
+          @code = args.pop
+          add_suppressed(*exceptions)
         end
 
-        def add_suppressed(exception)
-          (@suppressed ||= []) << exception
+        def add_suppressed(*exceptions)
+          (@suppressed ||= []).concat(exceptions) if exceptions.any?
         end
       end
     end

data/ruby/neo4j/driver/internal/async/internal_async_session.rb

@@ -32,10 +32,8 @@ module Neo4j::Driver
             tx_future = @session.begin_transaction_async(mode, ** config)
 
             tx_future.when_complete do |tx, completion_error|
-              error = Util::Futures.completion_exception_cause(completion_error)
-
-              if !error.nil?
-                result_future.complete_exceptionally(error)
+              if completion_error
+                result_future.complete_exceptionally(completion_error)
               else
                 execute_work(result_future, tx, &work)
               end
@@ -48,10 +46,8 @@ module Neo4j::Driver
           work_future = safe_execute_work(tx, &work)
 
           work_future.when_complete do |result, completion_error|
-            error = Util::Futures.completion_exception_cause(completion_error)
-
-            if !error.nil?
-              close_tx_after_failed_transaction_work(tx, result_future, error)
+            if completion_error
+              close_tx_after_failed_transaction_work(tx, result_future, completion_error)
             else
               close_tx_after_succeeded_transaction_work(tx, result_future, result)
             end
@@ -83,10 +79,8 @@ module Neo4j::Driver
 
         def close_tx_after_succeeded_transaction_work(tx, result_future, result)
           tx.close_async(true).when_complete do |_ignored, completion_error|
-            commit_error = Util::Futures.completion_exception_cause(completion_error)
-
-            if !commit_error.nil?
-              result_future.complete_exceptionally(commit_error)
+            if completion_error
+              result_future.complete_exceptionally(completion_error)
             else
               result_future.complete(result)
             end

data/ruby/neo4j/driver/internal/handlers/routing_response_handler.rb

@@ -19,13 +19,12 @@ module Neo4j::Driver
 
         private
 
-        def handled_error(received_error)
-          # TODO: probably not necessary with concurrent-ruby as it might not wrap exceptions like java
-          error = Futures.completion_exception_cause(received_error)
-
+        def handled_error(error)
           case error
           when Exceptions::ServiceUnavailableException
             handled_service_unavailable_exception(error)
+          when Exceptions::ProtocolException
+            handled_protocol_exception(error)
           when Exceptions::ClientException
             handled_client_exception(error)
           when Exceptions::TransientException
@@ -36,12 +35,22 @@ module Neo4j::Driver
         end
 
         def handled_service_unavailable_exception(e)
-          @error_handler.on_connection_failure(@address)
-          Exceptions::SessionExpiredException("Server at #{@address} is no longer available", e)
+          record_connection_failure
+          Exceptions::SessionExpiredException.new("Server at #{@address} is no longer available", e)
         end
 
         def handled_transient_exception(e)
-          e.code == "Neo.TransientError.General.DatabaseUnavailable" ? error_handler.on_connection_failure(@address) : e
+          record_connection_failure if e.code == "Neo.TransientError.General.DatabaseUnavailable"
+          e
+        end
+
+        def handled_protocol_exception(e)
+          record_connection_failure
+          e
+        end
+
+        def record_connection_failure
+          @error_handler.on_connection_failure(@address)
         end
 
         def handled_client_exception(e)

data/ruby/neo4j/driver/internal/retry/exponential_backoff_retry_logic.rb

@@ -92,10 +92,9 @@ module Neo4j::Driver
           end
 
           work_stage.on_resolution do |fulfilled, result, completion_error|
-            error = Futures.completion_exception_cause(completion_error)
-            if error
+            if completion_error
               # work failed in async way, attempt to schedule a retry
-              retry_on_error(result_future, work, start_time, retry_delay, error, errors)
+              retry_on_error(result_future, work, start_time, retry_delay, completion_error, errors)
             else
               result_future.fulfill(result)
             end

data/ruby/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '5.7.0.alpha.5'
+    VERSION = '5.7.0.alpha.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-ruby-driver
 version: !ruby/object:Gem::Version
-  version: 5.7.0.alpha.5
+  version: 5.7.0.alpha.6
 platform: ruby
 authors:
 - Heinrich Klobuczek
@@ -536,7 +536,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: "==== To Install:"
 test_files: []