neo4j-java-driver 0.3.5-java → 1.7.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 866688516c97a667d7f2a4a6e02f80b500a63adc4dbc2ba1b12fd56b2261d840
-  data.tar.gz: a466a394747f26a3304762a98bb2a197632756340c3fa41f47deae6345927c99
+  metadata.gz: e81fce8c0fbbb53c241d69d389d080b937a21196083c84d8af4aa08d063d4def
+  data.tar.gz: 98ccbc63152681cba9b0abfacf8f4411a407f35dbdae043090aec840b0d508e5
 SHA512:
-  metadata.gz: aba8b8646b15c048c1bf81b96af2acd3a1631221169edacc9beab7d1b6ca4f74e507a3bbec3873ffa7358ef705ea4a0b9088178b99a393d14af702b9b0c18d53
-  data.tar.gz: a9909b50278aa1330a93b30af06fde0f14f9f41d83fce4364fd59ca0be952d146f8c5bf69008508db1e036225086841f1e7d6ccea13e8f623521dc8bb34b54ac
+  metadata.gz: a96853c233c87cb214a655f26ef1eea9207585b4a3a3836719fd5e033572753db5f89df6f69f4396b46c9f543ac9fce572f887c194008bb0b9299dedd2550c2c
+  data.tar.gz: dc69debcd6fdfcd018c367f0b72da7c97d0a04a7685243f20b50539cac0e18edc188bf27056cb96fd33968576dddf87e6857e7940bbdbb179fbe3366b45e723a

data/jruby/neo4j/driver.rb

@@ -9,6 +9,8 @@ module Neo4j
   module Driver
     include_package 'org.neo4j.driver.v1'
 
+    Record = Java::OrgNeo4jDriverInternal::InternalRecord
+    StatementResult = Java::OrgNeo4jDriverInternal::InternalStatementResult
     Transaction = Java::OrgNeo4jDriverInternal::ExplicitTransaction
 
     module Net
@@ -40,7 +42,7 @@ end
 Loader.load
 
 Java::OrgNeo4jDriverInternal::InternalDriver.prepend Neo4j::Driver::Ext::InternalDriver
-Java::OrgNeo4jDriverInternal::InternalEntity.include Neo4j::Driver::Ext::MapAccessor
+Java::OrgNeo4jDriverInternal::InternalEntity.include Neo4j::Driver::Ext::InternalEntity
 Java::OrgNeo4jDriverInternal::InternalNode.prepend Neo4j::Driver::Ext::InternalNode
 Java::OrgNeo4jDriverInternal::InternalPath.include Neo4j::Driver::Ext::StartEndNaming
 Java::OrgNeo4jDriverInternal::InternalPath::SelfContainedSegment.include Neo4j::Driver::Ext::StartEndNaming

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

@@ -17,10 +17,8 @@ module Neo4j
           unit = nil
           case key.to_s
           when 'encryption'
-            unless value
-              method = :without_encryption
-              value = nil
-            end
+            method = :without_encryption unless value
+            value = nil
           when 'timeout'
             value = java.time.Duration.ofMillis(Driver::Internal::DurationNormalizer.milliseconds(value))
           when /time(out)?$/

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

@@ -20,8 +20,19 @@ module Neo4j
 
         def reverse_check
           yield
-        rescue StandardError => e
-          raise(e.cause || ExceptionMapper.reverse_exception_class(e)&.new('') || e)
+        rescue Neo4j::Driver::Exceptions::ServiceUnavailableException => e
+          raise(throwable(e.cause) || org.neo4j.driver.v1.exceptions.ServiceUnavailableException.new(e.message))
+        rescue Neo4j::Driver::Exceptions::Neo4jException,
+          Neo4j::Driver::Exceptions::NoSuchRecordException,
+          Neo4j::Driver::Exceptions::UntrustedServerException,
+          Neo4j::Driver::Exceptions::IllegalStateException => e
+          raise(throwable(e.cause) || e)
+        end
+
+        private
+
+        def throwable(e)
+          e if e.is_a? Java::JavaLang::Throwable
         end
       end
     end

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

@@ -23,14 +23,7 @@ module Neo4j
         end
 
         def arguments
-          [code, message, self, suppressed.map(&method(:mapped_exception))]
-        end
-
-        def self.reverse_exception_class(exception)
-          case exception
-          when Neo4j::Driver::Exceptions::ServiceUnavailableException
-            ServiceUnavailableException
-          end
+          [code, message, suppressed.map(&method(:mapped_exception))]
         end
 
         private

data/jruby/neo4j/driver/ext/{map_accessor.rb → internal_entity.rb}

@@ -3,14 +3,18 @@
 module Neo4j
   module Driver
     module Ext
-      module MapAccessor
+      module InternalEntity
         include MapConverter
 
-        alias properties to_hash
+        alias properties to_h
 
         def [](key)
           get(key.to_s).as_ruby_object
         end
+
+        def ==(other)
+          java_method(:isEqual).call(other)
+        end
       end
     end
   end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Neo4j
+  module Driver
+    module Ext
+      module InternalKeys
+        include ExceptionCheckable
+
+        def keys
+          check { super.map(&:to_sym) }
+        end
+      end
+    end
+  end
+end

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

@@ -4,12 +4,20 @@ module Neo4j
   module Driver
     module Ext
       module InternalRecord
+        include MapConverter
+        include InternalKeys
+
         def values
           java_send(:values).map(&:as_ruby_object)
         end
 
-        define_method(:[]) do |key|
-          java_method(:get, [key.is_a?(Integer) ? Java::int : java.lang.String]).call(key).as_ruby_object
+        def [](key)
+          case key
+          when Integer
+            java_method(:get, [Java::int]).call(key)
+          else
+            java_method(:get, [java.lang.String]).call(key.to_s)
+          end.as_ruby_object
         end
 
         def first

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

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

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

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

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

@@ -11,7 +11,7 @@ module Neo4j
           when Java::OrgNeo4jDriverInternalTypes::TypeConstructor::LIST
             values(&:itself).map(&:as_ruby_object)
           when Java::OrgNeo4jDriverInternalTypes::TypeConstructor::MAP
-            to_hash
+            to_h
           when Java::OrgNeo4jDriverInternalTypes::TypeConstructor::DATE
             date = as_local_date
             Date.new(date.year, date.month_value, date.day_of_month)

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

@@ -4,12 +4,11 @@ module Neo4j
   module Driver
     module Exceptions
       class Neo4jException < RuntimeError
-        attr_reader :code, :cause, :suppressed
+        attr_reader :code, :suppressed
 
         def initialize(*args)
           @code = args.shift if args.count > 1
           message = args.shift
-          @cause = args.shift
           @suppressed = args.shift
           super(message)
         end

data/lib/neo4j/driver/version.rb

@@ -2,6 +2,6 @@
 
 module Neo4j
   module Driver
-    VERSION = '0.3.5'
+    VERSION = '1.7.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-java-driver
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 1.7.3
 platform: java
 authors:
 - Heinrich Klobuczek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -218,12 +218,13 @@ files:
 - jruby/neo4j/driver/ext/graph_database.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
+- jruby/neo4j/driver/ext/internal_keys.rb
 - 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/logger.rb
-- jruby/neo4j/driver/ext/map_accessor.rb
 - jruby/neo4j/driver/ext/map_converter.rb
 - jruby/neo4j/driver/ext/neo_converter.rb
 - jruby/neo4j/driver/ext/network_session.rb