neo4j-java-driver 4.3.0-java → 4.3.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4994dc680ba3cabb50d4a43bad5f5bdae465187f134e9d4200db7c74f9738440
-  data.tar.gz: 342c65dee92f9c271e10ef75674584712745068e8192656a62cc5ff501012df1
+  metadata.gz: 0a6cd0aaaceead12534ad80f1a13b10cf3007a19d81ec38e0fbac49459288b17
+  data.tar.gz: 68c815539b9b430218d8a75f2fcf693440afed8deae43e02f8b7c08b0fd5ab8c
 SHA512:
-  metadata.gz: 45e2ca8031c98c137a1c5d963e213734dddfe888ab452b5bd1d64988c603bd58fdbf3d97bcdf05686f98cc4d10585eaf522311a017ab2cef4d7a164331680a75
-  data.tar.gz: 06ed87adc45817031f402d9e546b8fb9bdaf05084cd3c92d4f7a63e1988543e86decaba4581aa09daa94320024d8a6015da561c4fdeaf09f73e833a0fb97da32
+  metadata.gz: 4175c8bda63b2b0f74fd4ddfb0707fe108313c38afcf9b53776e9039065b1c13f5f25ce5a66f6a96bd49b0a15e19bd07f6e8609a2a36efad78681fe32ef03245
+  data.tar.gz: 2b9597522dcfb507a38fd473ca9c1f5400b925eecc31488e6fe82cf6825db8ec2bb7b0c9fc516497ad76124a608216422847553345ff1870be1cc5bc32050e4b

data/README.md

@@ -75,9 +75,27 @@ To run the tests the following tools need to be installed:
     $ pip3 install --user git+https://github.com/klobuczek/boltkit@1.3#egg=boltkit
     $ neoctrl-install -e 4.0.2 servers
     $ neoctrl-configure servers/neo4j-enterprise-4.0.2 dbms.directories.import= dbms.default_listen_address=::
-    $ neoctrl-set-initial-password password servers/neo4j-enterprise-4.0.2
+    $ neoctrl-set-initial-password pass servers/neo4j-enterprise-4.0.2
     $ neoctrl-start servers/neo4j-enterprise-4.0.2
 
+To run the test using ruby driver:
+```console
+$ driver=ruby bin/setup
+$ driver=ruby rspec spec
+```
+
+To run the test using java driver:
+```console
+$ driver=java bin/setup
+$ driver=java rspec spec
+```
+
+In case of heap space memory error (`org.neo4j.driver.exceptions.DatabaseException: Java heap space`), you should limit the dbms memory, for example:
+
+```console
+$ neoctrl-configure servers/neo4j-enterprise-4.0.2 dbms.memory.pagecache.size=600m dbms.memory.heap.max_size=600m dbms.memory.heap.initial_size=600m dbms.directories.import= dbms.connectors.default_listen_address=::
+```
+
 ## Contributing
 
 Suggestions, improvements, bug reports and pull requests are welcome on GitHub at https://github.com/neo4jrb/neo4j-ruby-driver.

data/jruby/neo4j/driver/ext/async_converter.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Neo4j::Driver::Ext
+  module AsyncConverter
+    include ExceptionMapper
+
+    private
+
+    def to_future(completion_stage)
+      Concurrent::Promises.resolvable_future.tap do |future|
+        completion_stage.then_apply(&future.method(:fulfill)).exceptionally { |e| future.reject(mapped_exception(e)) }
+      end
+    end
+  end
+end

data/jruby/neo4j/driver/ext/exception_checkable.rb

@@ -4,18 +4,12 @@ module Neo4j
   module Driver
     module Ext
       module ExceptionCheckable
+        include ExceptionMapper
+
         def check
           yield
-        rescue Java::OrgNeo4jDriverExceptions::Neo4jException => e
-          e.reraise
-        rescue Java::OrgNeo4jDriverExceptions::NoSuchRecordException => e
-          raise Neo4j::Driver::Exceptions::NoSuchRecordException, e.message
-        rescue Java::OrgNeo4jDriverExceptions::UntrustedServerException => e
-          raise Neo4j::Driver::Exceptions::UntrustedServerException, e.message
-        rescue Java::JavaLang::IllegalStateException => e
-          raise Neo4j::Driver::Exceptions::IllegalStateException, e.message
-        rescue Java::JavaLang::IllegalArgumentException => e
-          raise ArgumentError, e.message
+        rescue Java::JavaLang::RuntimeException => e
+          raise mapped_exception(e)
         end
 
         def reverse_check

data/jruby/neo4j/driver/ext/exception_mapper.rb

@@ -1,44 +1,56 @@
 # frozen_string_literal: true
 
-java_import org.neo4j.driver.exceptions.AuthenticationException
-java_import org.neo4j.driver.exceptions.ClientException
-java_import org.neo4j.driver.exceptions.DatabaseException
-java_import org.neo4j.driver.exceptions.ProtocolException
-java_import org.neo4j.driver.exceptions.ResultConsumedException
-java_import org.neo4j.driver.exceptions.SecurityException
-java_import org.neo4j.driver.exceptions.ServiceUnavailableException
-java_import org.neo4j.driver.exceptions.SessionExpiredException
-java_import org.neo4j.driver.exceptions.TransientException
-java_import org.neo4j.driver.exceptions.UntrustedServerException
-
 module Neo4j
   module Driver
     module Ext
       module ExceptionMapper
-        def reraise
-          raise mapped_exception(self)
-        end
+        java_import org.neo4j.driver.exceptions.AuthenticationException
+        java_import org.neo4j.driver.exceptions.AuthorizationExpiredException
+        java_import org.neo4j.driver.exceptions.ClientException
+        java_import org.neo4j.driver.exceptions.ConnectionReadTimeoutException
+        java_import org.neo4j.driver.exceptions.DatabaseException
+        java_import org.neo4j.driver.exceptions.DiscoveryException
+        java_import org.neo4j.driver.exceptions.FatalDiscoveryException
+        java_import org.neo4j.driver.exceptions.ProtocolException
+        java_import org.neo4j.driver.exceptions.ResultConsumedException
+        java_import org.neo4j.driver.exceptions.SecurityException
+        java_import org.neo4j.driver.exceptions.ServiceUnavailableException
+        java_import org.neo4j.driver.exceptions.SessionExpiredException
+        java_import org.neo4j.driver.exceptions.TransactionNestingException
+        java_import org.neo4j.driver.exceptions.TransientException
+        java_import org.neo4j.driver.exceptions.UntrustedServerException
 
         def mapped_exception(exception)
-          mapped_exception_class(exception)&.new(*exception.arguments) || exception
+          mapped_neo4j_exception_class(exception)&.new(*arguments(exception)) ||
+            mapped_runtime_exception_class(exception)&.new(exception.message) || exception
         end
 
-        def arguments
-          [code, message, suppressed.map(&method(:mapped_exception))]
+        def arguments(e)
+          [e.code, e.message, e.suppressed.map(&method(:mapped_exception))]
         end
 
         private
 
-        def mapped_exception_class(exception)
-          case exception
+        def mapped_neo4j_exception_class(exception_class)
+          case exception_class
           when AuthenticationException
             Neo4j::Driver::Exceptions::AuthenticationException
+          when AuthorizationExpiredException
+            Neo4j::Driver::Exceptions::AuthorizationExpiredException
+          when FatalDiscoveryException
+            Neo4j::Driver::Exceptions::FatalDiscoveryException
           when ResultConsumedException
             Neo4j::Driver::Exceptions::ResultConsumedException
+          when TransactionNestingException
+            Neo4j::Driver::Exceptions::TransactionNestingException
           when ClientException
             Neo4j::Driver::Exceptions::ClientException
+          when ConnectionReadTimeoutException
+            Neo4j::Driver::Exceptions::ConnectionReadTimeoutException
           when DatabaseException
             Neo4j::Driver::Exceptions::DatabaseException
+          when DiscoveryException
+            Neo4j::Driver::Exceptions::DiscoveryException
           when ProtocolException
             Neo4j::Driver::Exceptions::ProtocolException
           when SecurityException
@@ -53,6 +65,21 @@ module Neo4j
             nil
           end
         end
+
+        def mapped_runtime_exception_class(exception_class)
+          case exception_class
+          when Java::OrgNeo4jDriverExceptions::NoSuchRecordException
+            Neo4j::Driver::Exceptions::NoSuchRecordException
+          when Java::OrgNeo4jDriverExceptions::UntrustedServerException
+            Neo4j::Driver::Exceptions::UntrustedServerException
+          when Java::JavaLang::IllegalStateException
+            Neo4j::Driver::Exceptions::IllegalStateException
+          when Java::JavaLang::IllegalArgumentException
+            ArgumentError
+          else
+            nil
+          end
+        end
       end
     end
   end

data/jruby/neo4j/driver/ext/internal/async/internal_async_session.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Ext
+      module Internal
+        module Async
+          module InternalAsyncSession
+            include ConfigConverter
+            include RunOverride
+            include AsyncConverter
+
+            def run_async(statement, parameters = {}, config = {})
+              to_future(
+                java_method(:runAsync, [org.neo4j.driver.Query, org.neo4j.driver.TransactionConfig])
+                  .call(to_statement(statement, parameters), to_java_config(Neo4j::Driver::TransactionConfig, config)))
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/jruby/neo4j/driver/ext/internal/cursor/disposable_async_result_cursor.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Neo4j::Driver::Ext
+  module Internal
+    module Cursor
+      module DisposableAsyncResultCursor
+        include AsyncConverter
+
+        def next_async
+          to_future(super)
+        end
+      end
+    end
+  end
+end

data/jruby/neo4j/driver/ext/internal_driver.rb

@@ -7,6 +7,7 @@ module Neo4j
         extend AutoClosable
         include ConfigConverter
         include ExceptionCheckable
+        include AsyncConverter
 
         auto_closable :session
 
@@ -15,6 +16,15 @@ module Neo4j
             .call(to_java_config(Neo4j::Driver::SessionConfig, session_config))
         end
 
+        def async_session(**session_config)
+          java_method(:async_session, [org.neo4j.driver.SessionConfig])
+            .call(to_java_config(Neo4j::Driver::SessionConfig, session_config))
+        end
+
+        def close_async
+          to_future(super)
+        end
+
         def verify_connectivity
           check { super }
         end

data/jruby/neo4j/driver/ext/internal_transaction.rb

@@ -15,9 +15,9 @@ module Neo4j
           check { super }
         end
 
-        # def rollback
-        #   check { super }
-        # end
+        def rollback
+          check { super }
+        end
       end
     end
   end

data/jruby/neo4j/driver.rb

@@ -31,6 +31,10 @@ module Neo4j
     # Workaround for missing zeitwerk support as of jruby-9.2.13.0
     module Ext
       module Internal
+        module Async
+        end
+        module Cursor
+        end
         module Summary
         end
       end
@@ -56,6 +60,7 @@ Java::OrgNeo4jDriverInternal::InternalRelationship.prepend Neo4j::Driver::Ext::I
 Java::OrgNeo4jDriverInternal::InternalResult.prepend Neo4j::Driver::Ext::InternalResult
 Java::OrgNeo4jDriverInternal::InternalSession.prepend Neo4j::Driver::Ext::InternalSession
 Java::OrgNeo4jDriverInternal::InternalTransaction.prepend Neo4j::Driver::Ext::InternalTransaction
+Java::OrgNeo4jDriverInternalAsync::InternalAsyncSession.prepend Neo4j::Driver::Ext::Internal::Async::InternalAsyncSession
+Java::OrgNeo4jDriverInternalCursor::DisposableAsyncResultCursor.prepend Neo4j::Driver::Ext::Internal::Cursor::DisposableAsyncResultCursor
 Java::OrgNeo4jDriverInternalSummary::InternalResultSummary.prepend Neo4j::Driver::Ext::Internal::Summary::InternalResultSummary
 Java::OrgNeo4jDriverInternalValue::ValueAdapter.include Neo4j::Driver::Ext::RubyConverter
-Java::OrgNeo4jDriverExceptions::Neo4jException.include Neo4j::Driver::Ext::ExceptionMapper

data/lib/loader.rb

@@ -8,6 +8,7 @@ class Loader
     loader.tag = 'neo4j-ruby-driver'
     loader.push_dir(File.expand_path(__dir__))
     loader.push_dir(File.dirname(File.dirname(caller_locations(1..1).first.path)))
+    yield loader if block_given?
     loader.ignore(File.expand_path('neo4j-*-driver_jars.rb', __dir__))
     loader.ignore(File.expand_path('neo4j_ruby_driver.rb', __dir__))
     loader.ignore(File.expand_path('org', __dir__))

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

@@ -3,7 +3,7 @@
 module Neo4j
   module Driver
     module Exceptions
-      class AuthenticationException < Neo4jException
+      class AuthenticationException < SecurityException
       end
     end
   end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Exceptions
+      class AuthorizationExpiredException < SecurityException
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Exceptions
+      class ConnectionReadTimeoutException < SecurityException
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Exceptions
+      class DiscoveryException < Neo4jException
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Exceptions
+      class FatalDiscoveryException < ClientException
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Exceptions
+      class TransactionNestingException < ClientException
+      end
+    end
+  end
+end

data/lib/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '4.3.0'
+    VERSION = '4.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-java-driver
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: java
 authors:
 - Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -210,12 +210,15 @@ files:
 - LICENSE.txt
 - README.md
 - jruby/neo4j/driver.rb
+- jruby/neo4j/driver/ext/async_converter.rb
 - jruby/neo4j/driver/ext/auth_tokens.rb
 - jruby/neo4j/driver/ext/bookmark.rb
 - jruby/neo4j/driver/ext/config_converter.rb
 - jruby/neo4j/driver/ext/exception_checkable.rb
 - jruby/neo4j/driver/ext/exception_mapper.rb
 - jruby/neo4j/driver/ext/graph_database.rb
+- jruby/neo4j/driver/ext/internal/async/internal_async_session.rb
+- jruby/neo4j/driver/ext/internal/cursor/disposable_async_result_cursor.rb
 - jruby/neo4j/driver/ext/internal/summary/internal_result_summary.rb
 - jruby/neo4j/driver/ext/internal_driver.rb
 - jruby/neo4j/driver/ext/internal_entity.rb
@@ -236,8 +239,12 @@ files:
 - lib/loader.rb
 - lib/neo4j/driver/auto_closable.rb
 - lib/neo4j/driver/exceptions/authentication_exception.rb
+- lib/neo4j/driver/exceptions/authorization_expired_exception.rb
 - lib/neo4j/driver/exceptions/client_exception.rb
+- lib/neo4j/driver/exceptions/connection_read_timeout_exception.rb
 - lib/neo4j/driver/exceptions/database_exception.rb
+- lib/neo4j/driver/exceptions/discovery_exception.rb
+- lib/neo4j/driver/exceptions/fatal_discovery_exception.rb
 - lib/neo4j/driver/exceptions/illegal_state_exception.rb
 - lib/neo4j/driver/exceptions/neo4j_exception.rb
 - lib/neo4j/driver/exceptions/no_such_record_exception.rb
@@ -246,6 +253,7 @@ files:
 - lib/neo4j/driver/exceptions/security_exception.rb
 - lib/neo4j/driver/exceptions/service_unavailable_exception.rb
 - lib/neo4j/driver/exceptions/session_expired_exception.rb
+- lib/neo4j/driver/exceptions/transaction_nesting_exception.rb
 - lib/neo4j/driver/exceptions/transient_exception.rb
 - lib/neo4j/driver/exceptions/untrusted_server_exception.rb
 - lib/neo4j/driver/internal/duration_normalizer.rb
@@ -281,8 +289,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- jar org.neo4j.driver, neo4j-java-driver, 4.3.2
-rubygems_version: 3.1.6
+- jar org.neo4j.driver, neo4j-java-driver, 4.3.4
+rubygems_version: 3.2.14
 signing_key:
 specification_version: 4
 summary: ''