neo4j-ruby-driver 4.4.6-java → 5.13.0.alpha.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a69c65243723b5585d9f7941be6849ab0bbc9bb49801e3198f7e53b5091dce77
-  data.tar.gz: 50e9aae968b14bccaba92ce2b3e76276b2766fd2f74ace4900e4b00310ab00f4
+  metadata.gz: dbf26d42944323e18fc28f944ff365d981755118e1d01f52345c72ebdcea5641
+  data.tar.gz: 708c207bbc0602450a4514876b910319652166946f657c5ae7ff7993d53056fa
 SHA512:
-  metadata.gz: 949eeec7b5d6a9bf63d91bd547e4cba571da2cc718f9f120d9b1fb615726acff9493bb57311156b6ff318c9afe60d4f528d2cc8f54957b107752857eeee8ab20
-  data.tar.gz: a52b092b3223fe7ab0e6ad776ab7802c6656c89d1b56f4463652f170325884332edc71032709e627a84d9bb03c882b230ac69f93eed456b1d690c13b9ca84850
+  metadata.gz: 934c8d730afe408fe9b840c5bfc6c00c09886b0742d055139ead934c6adf59142171a3cdfdf3cabbbeefe57608b5b1417523d7dfc9232164bb728cc8285ef253
+  data.tar.gz: 93117f5187a574967021949c3b3a4bf0b4dc48706fba5080d2cc8f2210e598778460b0d22e46046c06d677cda165fb3d620239b94bb4d20331d57030c8ea8b9c

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

@@ -13,7 +13,7 @@ module Neo4j
         end
 
         def apply_to(builder, **hash)
-          hash.compact.reduce(builder) { |object, key_value| object.send(*config_method(*key_value)) }
+          hash.compact.reduce(builder) { |object, (key, value)| object.send(*config_method(key, value)) }
         end
 
         def config_method(key, value)
@@ -45,6 +45,8 @@ module Neo4j
                      else
                        "with_#{value}_revocation_checks"
                      end
+          when 'notification_config'
+            value = notification_config(**value)
           else
             value = to_neo(value, skip_unknown: true)
           end
@@ -63,6 +65,18 @@ module Neo4j
             end
           apply_to(trust_strategy, **config)
         end
+
+        def notification_config(minimum_severity: nil, disabled_categories: nil)
+          org.neo4j.driver.internal.InternalNotificationConfig.new(
+            value_of(org.neo4j.driver.internal.InternalNotificationSeverity, minimum_severity),
+            disabled_categories
+              &.map { |value| value_of(org.neo4j.driver.internal.InternalNotificationCategory, value) }
+              &.then(&java.util.HashSet.method(:new)))
+        end
+
+        def value_of(klass, value)
+          klass.value_of(value&.to_s&.upcase).or_else(nil)
+        end
       end
     end
   end

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

@@ -19,6 +19,7 @@ module Neo4j
         java_import org.neo4j.driver.exceptions.TokenExpiredException
         java_import org.neo4j.driver.exceptions.TransactionNestingException
         java_import org.neo4j.driver.exceptions.TransientException
+        java_import org.neo4j.driver.exceptions.UnsupportedFeatureException
         java_import org.neo4j.driver.exceptions.UntrustedServerException
 
         def mapped_exception(exception)
@@ -48,6 +49,8 @@ module Neo4j
             Neo4j::Driver::Exceptions::SecurityException
           when TransactionNestingException
             Neo4j::Driver::Exceptions::TransactionNestingException
+          when UnsupportedFeatureException
+            Neo4j::Driver::Exceptions::UnsupportedFeatureException
           when ClientException
             Neo4j::Driver::Exceptions::ClientException
           when ConnectionReadTimeoutException

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

@@ -8,7 +8,7 @@ module Neo4j
         include ConfigConverter
         include ExceptionCheckable
 
-        auto_closable :driver, :routing_driver
+        auto_closable :driver
 
         def driver(uri, auth_token = Neo4j::Driver::AuthTokens.none, **config)
           check do
@@ -17,10 +17,14 @@ module Neo4j
           end
         end
 
-        def routing_driver(routing_uris, auth_token, **config)
+        def internal_driver(uri, auth_token = Neo4j::Driver::AuthTokens.none, **config, &domain_name_resolver)
           check do
-            super(routing_uris.map { |uri| java.net.URI.create(uri.to_s) }, auth_token,
-                  to_java_config(Neo4j::Driver::Config, **config))
+            java_uri = java.net.URI.create(uri.to_s)
+            java_config = to_java_config(Neo4j::Driver::Config, **config)
+            Internal::DriverFactory
+              .new(&domain_name_resolver)
+              .new_instance(java_uri, org.neo4j.driver.internal.security.StaticAuthTokenManager.new(auth_token),
+                            java_config)
           end
         end
       end

data/jruby/neo4j/driver/ext/internal/driver_factory.rb

@@ -0,0 +1,24 @@
+module Neo4j
+  module Driver
+    module Ext
+      module Internal
+        class DriverFactory < org.neo4j.driver.internal.DriverFactory
+          def initialize(&domain_name_resolver)
+            super()
+            @domain_name_resolver = ->(name) do
+              domain_name_resolver.call(name).map do |addr|
+                java.net.InetAddress.get_by_name(addr)
+              rescue java.net.UnknownHostException => e
+                raise java.lang.RuntimeException.new(e)
+              end
+            end
+          end
+
+          def getDomainNameResolver
+            @domain_name_resolver
+          end
+        end
+      end
+    end
+  end
+end

data/jruby/neo4j/driver/ext/internal/internal_notification_common.rb

@@ -0,0 +1,13 @@
+module Neo4j
+  module Driver
+    module Ext
+      module Internal
+        module InternalNotificationCommon
+          def type
+            super.to_s
+          end
+        end
+      end
+    end
+  end
+end

data/jruby/neo4j/driver/ext/internal/summary/internal_notification.rb

@@ -0,0 +1,27 @@
+module Neo4j
+  module Driver
+    module Ext
+      module Internal
+        module Summary
+          module InternalNotification
+            def severity_level
+              super.or_else(nil)
+            end
+
+            def raw_severity_level
+              super.or_else(nil)
+            end
+
+            def raw_category
+              super.or_else(nil)
+            end
+
+            def category
+              super.or_else(nil)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/jruby/neo4j/driver/ext/internal/summary/internal_plan.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Ext
+      module Internal
+        module Summary
+          module InternalPlan
+            def args
+              arguments&.to_h&.transform_values(&:as_ruby_object)
+            end
+
+            def identifiers
+              super.to_a
+            end
+
+            # this part should probably be included in testkit-backend
+            def to_h
+              {operator_type:, args:, identifiers:, children: children&.map(&:to_h)}
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/jruby/neo4j/driver/ext/internal/summary/internal_result_summary.rb

@@ -9,7 +9,9 @@ module Neo4j
             java_import org.neo4j.driver.summary.QueryType
 
             %i[result_available_after result_consumed_after].each do |method|
-              define_method(method) { super(Java::JavaUtilConcurrent::TimeUnit::MILLISECONDS) }
+              define_method(method) do
+                super(Java::JavaUtilConcurrent::TimeUnit::MILLISECONDS).then { |val| val unless val == -1 }
+              end
             end
 
             def query_type

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

@@ -28,6 +28,14 @@ module Neo4j
         def verify_connectivity
           check { super }
         end
+
+        def verify_authentication(auth_token)
+          check { super }
+        end
+
+        def supports_session_auth?
+          check { supports_session_auth }
+        end
       end
     end
   end

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

@@ -17,6 +17,10 @@ module Neo4j
         def each(&block)
           check { stream.for_each(&block) }
         end
+
+        def to_a
+          check { list.to_a }
+        end
       end
     end
   end

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

@@ -16,7 +16,7 @@ module Neo4j
             date = as_local_date
             Date.new(date.year, date.month_value, date.day_of_month)
           when Java::OrgNeo4jDriverInternalTypes::TypeConstructor::DURATION
-            ActiveSupport::Duration.parse(as_iso_duration.to_s)
+            Driver::Internal::DurationNormalizer.create(*%i[months days seconds nanoseconds].map(&as_object.method(:send)))
           when Java::OrgNeo4jDriverInternalTypes::TypeConstructor::POINT
             point = as_point
             Types::Point.new(srid: point.srid, x: point.x, y: point.y, z: nullable(point.z))

data/jruby/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '4.4.6'
+    VERSION = '5.13.0.alpha.1'
   end
 end

data/jruby/neo4j/driver.rb

@@ -43,6 +43,8 @@ Java::OrgNeo4jDriverInternal::InternalBookmark.prepend Neo4j::Driver::Ext::Inter
 Java::OrgNeo4jDriverInternal::InternalDriver.prepend Neo4j::Driver::Ext::InternalDriver
 Java::OrgNeo4jDriverInternal::InternalEntity.include Neo4j::Driver::Ext::InternalEntity
 Java::OrgNeo4jDriverInternal::InternalNode.prepend Neo4j::Driver::Ext::InternalNode
+Java::OrgNeo4jDriverInternal::InternalNotificationCategory.prepend Neo4j::Driver::Ext::Internal::InternalNotificationCommon
+Java::OrgNeo4jDriverInternal::InternalNotificationSeverity.prepend Neo4j::Driver::Ext::Internal::InternalNotificationCommon
 Java::OrgNeo4jDriverInternal::InternalPath.include Neo4j::Driver::Ext::StartEndNaming
 Java::OrgNeo4jDriverInternal::InternalPath::SelfContainedSegment.include Neo4j::Driver::Ext::StartEndNaming
 Java::OrgNeo4jDriverInternal::InternalRecord.prepend Neo4j::Driver::Ext::InternalRecord
@@ -54,5 +56,7 @@ Java::OrgNeo4jDriverInternalAsync::InternalAsyncSession.prepend Neo4j::Driver::E
 Java::OrgNeo4jDriverInternalCluster::RoutingTableRegistryImpl.include Neo4j::Driver::Ext::Internal::Cluster::RoutingTableRegistryImpl
 Java::OrgNeo4jDriverInternalCursor::DisposableAsyncResultCursor.prepend Neo4j::Driver::Ext::Internal::Cursor::DisposableAsyncResultCursor
 Java::OrgNeo4jDriverInternalMetrics::InternalConnectionPoolMetrics.include Neo4j::Driver::Ext::Internal::Metrics::InternalConnectionPoolMetrics
+Java::OrgNeo4jDriverInternalSummary::InternalNotification.prepend Neo4j::Driver::Ext::Internal::Summary::InternalNotification
+Java::OrgNeo4jDriverInternalSummary::InternalPlan.prepend Neo4j::Driver::Ext::Internal::Summary::InternalPlan
 Java::OrgNeo4jDriverInternalSummary::InternalResultSummary.prepend Neo4j::Driver::Ext::Internal::Summary::InternalResultSummary
 Java::OrgNeo4jDriverInternalValue::ValueAdapter.include Neo4j::Driver::Ext::RubyConverter

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Exceptions
+      # A feature is not supported in a given setup.
+      class UnsupportedFeatureException < ClientException
+      end
+    end
+  end
+end

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

@@ -21,6 +21,11 @@ module Neo4j
             duration&.in_milliseconds&.round
           end
 
+          def create(months, days, seconds, nanoseconds)
+            { months:, days:, seconds: seconds + (nanoseconds.zero? ? 0 : nanoseconds * BigDecimal('1e-9')) }
+              .sum { |key, value| ActiveSupport::Duration.send(key, value) }
+          end
+
           private
 
           def divmod(number, factor)

data/lib/neo4j-ruby-driver_loader.rb

@@ -2,10 +2,7 @@
 
 require 'active_support/concern'
 require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/object/blank'
 require 'active_support/isolated_execution_state' if Gem::Requirement.create('>= 7').satisfied_by?(Gem.loaded_specs["activesupport"].version) # TODO: this should not be necessary https://github.com/rails/rails/issues/43851
-require 'active_support/deprecator' if Gem::Requirement.create('>= 7.1').satisfied_by?(Gem.loaded_specs["activesupport"].version)
-require 'active_support/deprecation'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/duration'
 require 'active_support/time'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-ruby-driver
 version: !ruby/object:Gem::Version
-  version: 4.4.6
+  version: 5.13.0.alpha.1
 platform: java
 authors:
 - Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-22 00:00:00.000000000 Z
+date: 2023-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '7.1'
   name: activesupport
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -55,7 +55,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
   name: jar-dependencies
@@ -63,7 +63,7 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
@@ -234,8 +234,12 @@ files:
 - jruby/neo4j/driver/ext/internal/async/internal_async_session.rb
 - jruby/neo4j/driver/ext/internal/cluster/routing_table_registry_impl.rb
 - jruby/neo4j/driver/ext/internal/cursor/disposable_async_result_cursor.rb
+- jruby/neo4j/driver/ext/internal/driver_factory.rb
 - jruby/neo4j/driver/ext/internal/internal_bookmark.rb
+- jruby/neo4j/driver/ext/internal/internal_notification_common.rb
 - jruby/neo4j/driver/ext/internal/metrics/internal_connection_pool_metrics.rb
+- jruby/neo4j/driver/ext/internal/summary/internal_notification.rb
+- jruby/neo4j/driver/ext/internal/summary/internal_plan.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
@@ -276,6 +280,7 @@ files:
 - lib/neo4j/driver/exceptions/token_expired_exception.rb
 - lib/neo4j/driver/exceptions/transaction_nesting_exception.rb
 - lib/neo4j/driver/exceptions/transient_exception.rb
+- lib/neo4j/driver/exceptions/unsupported_feature_exception.rb
 - lib/neo4j/driver/exceptions/untrusted_server_exception.rb
 - lib/neo4j/driver/exceptions/value/lossy_coercion.rb
 - lib/neo4j/driver/exceptions/value/not_multi_valued.rb
@@ -312,11 +317,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 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, 4.4.12
+- jar org.neo4j.driver, neo4j-java-driver-all, 5.13.0
 rubygems_version: 3.3.26
 signing_key:
 specification_version: 4