neo4j-java-driver 1.7.4-java → 4.2.0.beta.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a39ad35198a8958f2857bfcfb6040ffffeee0338fee2105ff2ca4e4f98f162b
-  data.tar.gz: 5f617ac0e6a69992f8febe4ec4ed115383c8088b4732bf33c3607aa9994d8c96
+  metadata.gz: 199e69cb97be63f0b1e4e7abc8f180a80cf7d1de5d6929d03d72edb54c496ba7
+  data.tar.gz: a9dc598ff2ff6722a06327bcadeadbcfcdb316441fe9a0e23f376468f50b22ff
 SHA512:
-  metadata.gz: 59aa3597d96b34851293e27c49dee3d9d52d5a604112f35274f1dc5477fa87f1c5c27977d36e345ec413d195b1b4b128c6fa12c248d90c234bc88d9a9176f8bb
-  data.tar.gz: de8450ea68258da74d9e17274a12f2d7f83129fbd06a8e9eb497847cd487aa3a5ae3a1a8af4a4d10733bf1565b4cb645bee6caf28692bbce9269a05867e0ce12
+  metadata.gz: 5ceea589b041d3b90c0ef8a137bd171896b0d53f91fef31ffc6bff137a0a7fc9db6392b6870b5f2ece9ee1dd45a9882c339b23e0c0ac8a48325e4caa4e509761
+  data.tar.gz: e88fc71a1866a0a2aae1352830663ed2ac3eb056b02deae5d629212ea8dc45397d455a24b774249cf6e23d70370b58dd3083c29fce5bd310dfa86e32f8be194b

data/jruby/neo4j/driver.rb

@@ -7,18 +7,18 @@ require 'neo4j-java-driver_jars'
 
 module Neo4j
   module Driver
-    include_package 'org.neo4j.driver.v1'
+    include_package 'org.neo4j.driver'
 
     Record = Java::OrgNeo4jDriverInternal::InternalRecord
-    StatementResult = Java::OrgNeo4jDriverInternal::InternalStatementResult
-    Transaction = Java::OrgNeo4jDriverInternal::ExplicitTransaction
+    Result = Java::OrgNeo4jDriverInternal::InternalResult
+    Transaction = Java::OrgNeo4jDriverInternal::InternalTransaction
 
     module Net
-      include_package 'org.neo4j.driver.v1.net'
+      include_package 'org.neo4j.driver.net'
     end
 
     module Summary
-      include_package 'org.neo4j.driver.v1.summary'
+      include_package 'org.neo4j.driver.summary'
     end
 
     module Types
@@ -28,7 +28,7 @@ module Neo4j
       Relationship = Java::OrgNeo4jDriverInternal::InternalRelationship
     end
 
-    # Workaround for missing zeitwerk support in jruby-9.2.8.0
+    # Workaround for missing zeitwerk support as of jruby-9.2.13.0
     module Ext
       module Internal
         module Summary
@@ -41,6 +41,11 @@ end
 
 Loader.load
 
+Java::OrgNeo4jDriver::AuthTokens.singleton_class.prepend Neo4j::Driver::Ext::AuthTokens
+Java::OrgNeo4jDriver::Bookmark.singleton_class.prepend Neo4j::Driver::Ext::Bookmark::ClassMethods
+Java::OrgNeo4jDriver::GraphDatabase.singleton_class.prepend Neo4j::Driver::Ext::GraphDatabase
+Java::OrgNeo4jDriver::Query.prepend Neo4j::Driver::Ext::Query
+Java::OrgNeo4jDriverInternal::InternalBookmark.include Neo4j::Driver::Ext::Bookmark::InstanceMethods
 Java::OrgNeo4jDriverInternal::InternalDriver.prepend Neo4j::Driver::Ext::InternalDriver
 Java::OrgNeo4jDriverInternal::InternalEntity.include Neo4j::Driver::Ext::InternalEntity
 Java::OrgNeo4jDriverInternal::InternalNode.prepend Neo4j::Driver::Ext::InternalNode
@@ -48,12 +53,9 @@ Java::OrgNeo4jDriverInternal::InternalPath.include Neo4j::Driver::Ext::StartEndN
 Java::OrgNeo4jDriverInternal::InternalPath::SelfContainedSegment.include Neo4j::Driver::Ext::StartEndNaming
 Java::OrgNeo4jDriverInternal::InternalRecord.prepend Neo4j::Driver::Ext::InternalRecord
 Java::OrgNeo4jDriverInternal::InternalRelationship.prepend Neo4j::Driver::Ext::InternalRelationship
-Java::OrgNeo4jDriverInternal::InternalStatementResult.prepend Neo4j::Driver::Ext::InternalStatementResult
-Java::OrgNeo4jDriverInternal::ExplicitTransaction.prepend Neo4j::Driver::Ext::ExplicitTransaction
-Java::OrgNeo4jDriverInternal::NetworkSession.prepend Neo4j::Driver::Ext::NetworkSession
+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::OrgNeo4jDriverInternalSummary::InternalResultSummary.prepend Neo4j::Driver::Ext::Internal::Summary::InternalResultSummary
 Java::OrgNeo4jDriverInternalValue::ValueAdapter.include Neo4j::Driver::Ext::RubyConverter
-Java::OrgNeo4jDriverV1::AuthTokens.singleton_class.prepend Neo4j::Driver::Ext::AuthTokens
-Java::OrgNeo4jDriverV1::GraphDatabase.singleton_class.prepend Neo4j::Driver::Ext::GraphDatabase
-Java::OrgNeo4jDriverV1::Statement.prepend Neo4j::Driver::Ext::Statement
-Java::OrgNeo4jDriverV1Exceptions::Neo4jException.include Neo4j::Driver::Ext::ExceptionMapper
+Java::OrgNeo4jDriverExceptions::Neo4jException.include Neo4j::Driver::Ext::ExceptionMapper

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

@@ -4,7 +4,7 @@ module Neo4j
   module Driver
     module Ext
       module AuthTokens
-        def basic(username, password)
+        def basic(username, password, realm = nil)
           Neo4j::Driver::Internal::Validator.require_non_nil_credentials!(username, password)
           super
         end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Ext
+      module Bookmark
+        module ClassMethods
+          def from(values)
+            super(java.util.HashSet.new(values))
+          end
+        end
+
+        module InstanceMethods
+          extend ActiveSupport::Concern
+          included do
+            delegate :to_set, to: :values
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,8 +8,8 @@ module Neo4j
 
         private
 
-        def to_java_config(builder_class, hash)
-          hash&.reduce(builder_class.builder) { |object, key_value| object.send(*config_method(*key_value)) }&.build
+        def to_java_config(builder_class, **hash)
+          hash.compact.reduce(builder_class.builder) { |object, key_value| object.send(*config_method(*key_value)) }.build
         end
 
         def config_method(key, value)
@@ -30,6 +30,8 @@ module Neo4j
           when 'resolver'
             proc = value
             value = ->(address) { java.util.HashSet.new(proc.call(address)) }
+          when 'bookmarks'
+            return [method, *value]
           else
             value = to_neo(value, skip_unknown: true)
           end

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

@@ -6,11 +6,11 @@ module Neo4j
       module ExceptionCheckable
         def check
           yield
-        rescue Java::OrgNeo4jDriverV1Exceptions::Neo4jException => e
+        rescue Java::OrgNeo4jDriverExceptions::Neo4jException => e
           e.reraise
-        rescue Java::OrgNeo4jDriverV1Exceptions::NoSuchRecordException => e
+        rescue Java::OrgNeo4jDriverExceptions::NoSuchRecordException => e
           raise Neo4j::Driver::Exceptions::NoSuchRecordException, e.message
-        rescue Java::OrgNeo4jDriverV1Exceptions::UntrustedServerException => e
+        rescue Java::OrgNeo4jDriverExceptions::UntrustedServerException => e
           raise Neo4j::Driver::Exceptions::UntrustedServerException, e.message
         rescue Java::JavaLang::IllegalStateException => e
           raise Neo4j::Driver::Exceptions::IllegalStateException, e.message
@@ -21,7 +21,7 @@ module Neo4j
         def reverse_check
           yield
         rescue Neo4j::Driver::Exceptions::ServiceUnavailableException => e
-          raise(throwable(e.cause) || org.neo4j.driver.v1.exceptions.ServiceUnavailableException.new(e.message))
+          raise(throwable(e.cause) || Java::OrgNeo4jDriverExceptions::ServiceUnavailableException.new(e.message))
         rescue Neo4j::Driver::Exceptions::Neo4jException,
           Neo4j::Driver::Exceptions::NoSuchRecordException,
           Neo4j::Driver::Exceptions::UntrustedServerException,

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

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
-java_import org.neo4j.driver.v1.exceptions.AuthenticationException
-java_import org.neo4j.driver.v1.exceptions.ClientException
-java_import org.neo4j.driver.v1.exceptions.DatabaseException
-java_import org.neo4j.driver.v1.exceptions.ProtocolException
-java_import org.neo4j.driver.v1.exceptions.SecurityException
-java_import org.neo4j.driver.v1.exceptions.ServiceUnavailableException
-java_import org.neo4j.driver.v1.exceptions.SessionExpiredException
-java_import org.neo4j.driver.v1.exceptions.TransientException
-java_import org.neo4j.driver.v1.exceptions.UntrustedServerException
+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
@@ -32,6 +33,8 @@ module Neo4j
           case exception
           when AuthenticationException
             Neo4j::Driver::Exceptions::AuthenticationException
+          when ResultConsumedException
+            Neo4j::Driver::Exceptions::ResultConsumedException
           when ClientException
             Neo4j::Driver::Exceptions::ClientException
           when DatabaseException

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

@@ -10,14 +10,14 @@ module Neo4j
 
         auto_closable :driver, :routing_driver
 
-        def driver(uri, auth_token = Neo4j::Driver::AuthTokens.none, config = nil)
+        def driver(uri, auth_token = Neo4j::Driver::AuthTokens.none, **config)
           check do
-            java_method(:driver, [java.lang.String, org.neo4j.driver.v1.AuthToken, org.neo4j.driver.v1.Config])
+            java_method(:driver, [java.lang.String, org.neo4j.driver.AuthToken, org.neo4j.driver.Config])
               .call(uri.to_s, auth_token, to_java_config(Neo4j::Driver::Config, config))
           end
         end
 
-        def routing_driver(routing_uris, auth_token, config)
+        def routing_driver(routing_uris, auth_token, **config)
           check do
             super(routing_uris.map { |uri| java.net.URI.create(uri.to_s) }, auth_token,
                   to_java_config(Neo4j::Driver::Config, config))

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

@@ -5,12 +5,18 @@ module Neo4j
     module Ext
       module InternalDriver
         extend AutoClosable
+        include ConfigConverter
+        include ExceptionCheckable
 
         auto_closable :session
 
-        def session(*args)
-          java_method(:session, [org.neo4j.driver.v1.AccessMode, java.lang.Iterable])
-            .call(*Neo4j::Driver::Internal::RubySignature.session(args))
+        def session(**session_config)
+          java_method(:session, [org.neo4j.driver.SessionConfig])
+            .call(to_java_config(Neo4j::Driver::SessionConfig, session_config))
+        end
+
+        def verify_connectivity
+          check { super }
         end
       end
     end

data/jruby/neo4j/driver/ext/{internal_statement_result.rb → internal_result.rb}

@@ -3,12 +3,12 @@
 module Neo4j
   module Driver
     module Ext
-      module InternalStatementResult
+      module InternalResult
         include Enumerable
         include ExceptionCheckable
         include InternalKeys
 
-        %i[has_next? next single consume summary peek].each do |method|
+        %i[has_next? next single consume peek].each do |method|
           define_method(method) do |*args, &block|
             check { super(*args, &block) }
           end

data/jruby/neo4j/driver/ext/{network_session.rb → internal_session.rb}

@@ -3,7 +3,7 @@
 module Neo4j
   module Driver
     module Ext
-      module NetworkSession
+      module InternalSession
         extend AutoClosable
         include ConfigConverter
         include ExceptionCheckable
@@ -26,7 +26,7 @@ module Neo4j
 
         def run(statement, parameters = {}, config = {})
           check do
-            java_method(:run, [org.neo4j.driver.v1.Statement, org.neo4j.driver.v1.TransactionConfig])
+            java_method(:run, [org.neo4j.driver.Query, org.neo4j.driver.TransactionConfig])
               .call(to_statement(statement, parameters), to_java_config(Neo4j::Driver::TransactionConfig, config))
           end
         end

data/jruby/neo4j/driver/ext/{explicit_transaction.rb → internal_transaction.rb}

@@ -3,13 +3,21 @@
 module Neo4j
   module Driver
     module Ext
-      module ExplicitTransaction
+      module InternalTransaction
         include ExceptionCheckable
         include RunOverride
 
         def run(statement, parameters = {})
           check { super(to_statement(statement, parameters)) }
         end
+
+        def commit
+          check { super }
+        end
+
+        # def rollback
+        #   check { super }
+        # end
       end
     end
   end

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

@@ -4,8 +4,8 @@ module Neo4j
   module Driver
     module Ext
       class Logger
-        include org.neo4j.driver.v1.Logger
-        include org.neo4j.driver.v1.Logging
+        include org.neo4j.driver.Logger
+        include org.neo4j.driver.Logging
 
         delegate :debug?, to: :@active_support_logger
 

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

@@ -5,7 +5,7 @@ module Neo4j
     module Ext
       module MapConverter
         def to_h
-          java_method(:asMap, [org.neo4j.driver.v1.util.Function]).call(&:itself).to_hash
+          java_method(:asMap, [java.util.function.Function]).call(&:itself).to_hash
             .transform_values!(&:as_ruby_object).symbolize_keys!
         end
       end

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

@@ -21,7 +21,7 @@ module Neo4j
               *Driver::Internal::DurationNormalizer.normalize(object)
             )
           when Types::Point
-            Java::OrgNeo4jDriverV1::Values.point(object.srid, *object.coordinates)
+            Java::OrgNeo4jDriver::Values.point(object.srid, *object.coordinates)
           when Types::OffsetTime
             Java::JavaTime::OffsetTime.of(object.hour, object.min, object.sec,
                                           object.nsec, Java::JavaTime::ZoneOffset.of_total_seconds(object.utc_offset))

data/jruby/neo4j/driver/ext/{statement.rb → query.rb}

@@ -3,7 +3,7 @@
 module Neo4j
   module Driver
     module Ext
-      module Statement
+      module Query
         def parameters
           super.as_ruby_object
         end

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

@@ -14,7 +14,7 @@ module Neo4j
 
         def to_statement(text, parameters)
           Neo4j::Driver::Internal::Validator.require_hash_parameters!(parameters)
-          Neo4j::Driver::Statement.new(text, to_neo(parameters || {}))
+          Neo4j::Driver::Query.new(text, to_neo(parameters || {}))
         end
       end
     end

data/lib/loader.rb

@@ -8,7 +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)))
-    loader.ignore(File.expand_path('neo4j-java-driver_jars.rb', __dir__))
+    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__))
     loader.inflector = Zeitwerk::GemInflector.new(File.expand_path('neo4j/driver', __dir__))

data/lib/neo4j/driver/auto_closable.rb

@@ -12,8 +12,8 @@ module Neo4j
       def with_block_definer(methods)
         Module.new do
           methods.each do |method|
-            define_method(method) do |*args, &block|
-              closable = super(*args)
+            define_method(method) do |*args, **kwargs, &block|
+              closable = super(*args, **kwargs)
               if block
                 begin
                   block.arity.zero? ? closable.instance_eval(&block) : block.call(closable)

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

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

data/lib/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '1.7.4'
+    VERSION = '4.2.0.beta.1'
   end
 end

data/lib/neo4j_ruby_driver.rb

@@ -13,6 +13,7 @@ if RUBY_PLATFORM.match?(/java/)
 end
 # End workaround
 
+require 'active_support/concern'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/duration'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-java-driver
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 4.2.0.beta.1
 platform: java
 authors:
 - Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -211,10 +211,10 @@ files:
 - README.md
 - jruby/neo4j/driver.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/explicit_transaction.rb
 - jruby/neo4j/driver/ext/graph_database.rb
 - jruby/neo4j/driver/ext/internal/summary/internal_result_summary.rb
 - jruby/neo4j/driver/ext/internal_driver.rb
@@ -223,15 +223,16 @@ files:
 - jruby/neo4j/driver/ext/internal_node.rb
 - jruby/neo4j/driver/ext/internal_record.rb
 - jruby/neo4j/driver/ext/internal_relationship.rb
-- jruby/neo4j/driver/ext/internal_statement_result.rb
+- jruby/neo4j/driver/ext/internal_result.rb
+- jruby/neo4j/driver/ext/internal_session.rb
+- jruby/neo4j/driver/ext/internal_transaction.rb
 - jruby/neo4j/driver/ext/logger.rb
 - jruby/neo4j/driver/ext/map_converter.rb
 - jruby/neo4j/driver/ext/neo_converter.rb
-- jruby/neo4j/driver/ext/network_session.rb
+- jruby/neo4j/driver/ext/query.rb
 - jruby/neo4j/driver/ext/ruby_converter.rb
 - jruby/neo4j/driver/ext/run_override.rb
 - jruby/neo4j/driver/ext/start_end_naming.rb
-- jruby/neo4j/driver/ext/statement.rb
 - lib/loader.rb
 - lib/neo4j/driver/auto_closable.rb
 - lib/neo4j/driver/exceptions/authentication_exception.rb
@@ -241,13 +242,13 @@ files:
 - lib/neo4j/driver/exceptions/neo4j_exception.rb
 - lib/neo4j/driver/exceptions/no_such_record_exception.rb
 - lib/neo4j/driver/exceptions/protocol_exception.rb
+- lib/neo4j/driver/exceptions/result_consumed_exception.rb
 - 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/transient_exception.rb
 - lib/neo4j/driver/exceptions/untrusted_server_exception.rb
 - lib/neo4j/driver/internal/duration_normalizer.rb
-- lib/neo4j/driver/internal/ruby_signature.rb
 - lib/neo4j/driver/internal/validator.rb
 - lib/neo4j/driver/types/bytes.rb
 - lib/neo4j/driver/types/local_date_time.rb
@@ -276,11 +277,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
-- jar org.neo4j.driver, neo4j-java-driver, 1.7.5
+- jar org.neo4j.driver, neo4j-java-driver, 4.2.1
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4

data/lib/neo4j/driver/internal/ruby_signature.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Neo4j
-  module Driver
-    module Internal
-      module RubySignature
-        class << self
-          def session(args)
-            [
-              args.empty? || args.first.is_a?(String) ? Neo4j::Driver::AccessMode::WRITE : args.shift, # mode
-              args # bookmarks
-            ]
-          end
-        end
-      end
-    end
-  end
-end