neo4j-core 5.1.14 → 6.0.0.alpha.1

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '5.1.14'
+    VERSION = '6.0.0.alpha.1'
   end
 end

data/lib/neo4j-embedded/embedded_label.rb

@@ -15,29 +15,28 @@ module Neo4j
       end
 
       def find_nodes(key = nil, value = nil)
-        iterator = _find_nodes(key, value)
+        iterator = if key
+                     @session.graph_db.find_nodes_by_label_and_property(as_java, key, value).iterator
+                   else
+                     ggo = Java::OrgNeo4jTooling::GlobalGraphOperations.at(@session.graph_db)
+                     ggo.getAllNodesWithLabel(as_java).iterator
+                   end
+
         iterator.to_a.map(&:wrapper)
       ensure
         iterator && iterator.close
       end
       tx_methods :find_nodes
 
-      def _find_nodes(key = nil, value = nil)
-        if key
-          @session.graph_db.find_nodes_by_label_and_property(as_java, key, value).iterator
-        else
-          ggo = Java::OrgNeo4jTooling::GlobalGraphOperations.at(@session.graph_db)
-          ggo.getAllNodesWithLabel(as_java).iterator
-        end
-      end
-
       def as_java
         self.class.as_java(@name.to_s)
       end
 
-      def create_index(*properties)
-        index_creator = @session.graph_db.schema.index_for(as_java)
+      def create_index(property, options = {}, session = Neo4j::Session.current)
+        validate_index_options!(options)
+        index_creator = session.graph_db.schema.index_for(as_java)
         # we can also use the PropertyConstraintCreator here
+        properties = property.is_a?(Array) ? property : [property]
         properties.inject(index_creator) { |creator, key| creator.on(key.to_s) }.create
       end
       tx_methods :create_index
@@ -62,8 +61,10 @@ module Neo4j
       tx_methods :uniqueness_constraints
 
 
-      def drop_index(*properties)
-        @session.graph_db.schema.indexes(as_java).each do |index_def|
+      def drop_index(property, options = {}, session = Neo4j::Session.current)
+        validate_index_options!(options)
+        properties = property.is_a?(Array) ? property : [property]
+        session.graph_db.schema.indexes(as_java).each do |index_def|
           # at least one match, TODO
           keys = index_def.property_keys.map(&:to_sym)
           index_def.drop if (properties - keys).count < properties.count
@@ -75,6 +76,7 @@ module Neo4j
         def as_java(labels)
           if labels.is_a?(Array)
             return nil if labels.empty?
+
             labels.inject([]) { |result, label| result << JAVA_CLASS.label(label.to_s) }.to_java(JAVA_CLASS)
           else
             JAVA_CLASS.label(labels.to_s)

data/lib/neo4j-embedded/embedded_node.rb

@@ -49,152 +49,154 @@ module Neo4j
 
     class EmbeddedNode < Neo4j::Node
       class << self
-        # This method is used to extend a Java Neo4j class so that it includes the same mixins as this class.
-        Java::OrgNeo4jKernelImplCore::NodeProxy.class_eval do
-          include Neo4j::Embedded::Property
-          include Neo4j::EntityEquality
-          include Neo4j::Core::ActiveEntity
-          extend Neo4j::Core::TxMethods
-
-          def inspect
-            "EmbeddedNode neo_id: #{neo_id}"
-          end
+        if !Neo4j::Core::Config.using_new_session?
+          # This method is used to extend a Java Neo4j class so that it includes the same mixins as this class.
+          Java::OrgNeo4jKernelImplCore::NodeProxy.class_eval do
+            include Neo4j::Embedded::Property
+            include Neo4j::EntityEquality
+            include Neo4j::Core::ActiveEntity
+            extend Neo4j::Core::TxMethods
+
+            def inspect
+              "EmbeddedNode neo_id: #{neo_id}"
+            end
 
-          def exist?
-            !!graph_database.get_node_by_id(neo_id)
-          rescue Java::OrgNeo4jGraphdb.NotFoundException
-            false
-          end
-          tx_methods :exist?
+            def exist?
+              !!graph_database.get_node_by_id(neo_id)
+            rescue Java::OrgNeo4jGraphdb.NotFoundException
+              false
+            end
+            tx_methods :exist?
 
-          def labels
-            _labels.iterator.map { |x| x.name.to_sym }
-          end
-          tx_methods :labels
+            def labels
+              _labels.iterator.map { |x| x.name.to_sym }
+            end
+            tx_methods :labels
 
-          alias_method :_labels, :getLabels
+            alias_method :_labels, :getLabels
 
-          def _java_label(label_name)
-            Java::OrgNeo4jGraphdb.DynamicLabel.label(label_name)
-          end
+            def _java_label(label_name)
+              Java::OrgNeo4jGraphdb.DynamicLabel.label(label_name)
+            end
 
-          def _add_label(*label_name)
-            label_name.each do |name|
-              addLabel(_java_label(name))
+            def _add_label(*label_name)
+              label_name.each do |name|
+                addLabel(_java_label(name))
+              end
             end
-          end
 
-          alias_method :add_label, :_add_label
-          tx_methods :add_label
+            alias_method :add_label, :_add_label
+            tx_methods :add_label
 
-          def _remove_label(*label_name)
-            label_name.each do |name|
-              removeLabel(_java_label(name))
+            def _remove_label(*label_name)
+              label_name.each do |name|
+                removeLabel(_java_label(name))
+              end
             end
-          end
 
-          alias_method :remove_label, :_remove_label
-          tx_methods :remove_label
+            alias_method :remove_label, :_remove_label
+            tx_methods :remove_label
 
-          def set_label(*label_names)
-            label_as_symbols = label_names.map(&:to_sym)
-            to_keep = labels & label_as_symbols
-            to_remove = labels - to_keep
-            _remove_label(*to_remove)
-            to_add = label_as_symbols - to_keep
-            _add_label(*to_add)
-          end
-          tx_methods :set_label
+            def set_label(*label_names)
+              label_as_symbols = label_names.map(&:to_sym)
+              to_keep = labels & label_as_symbols
+              to_remove = labels - to_keep
+              _remove_label(*to_remove)
+              to_add = label_as_symbols - to_keep
+              _add_label(*to_add)
+            end
+            tx_methods :set_label
 
-          def del
-            _rels.each(&:del)
-            delete
-            nil
-          end
-          tx_methods :del
-          tx_methods :delete
+            def del
+              _rels.each(&:del)
+              delete
+              nil
+            end
+            tx_methods :del
+            tx_methods :delete
 
-          alias_method :destroy, :del
-          tx_methods :destroy
+            alias_method :destroy, :del
+            tx_methods :destroy
 
-          def create_rel(type, other_node, props = nil)
-            rel = create_relationship_to(other_node.neo4j_obj, ToJava.type_to_java(type))
-            props.each_pair { |k, v| rel[k] = v } if props
-            rel
-          end
-          tx_methods :create_rel
+            def create_rel(type, other_node, props = nil)
+              rel = create_relationship_to(other_node.neo4j_obj, ToJava.type_to_java(type))
+              props.each_pair { |k, v| rel[k] = v } if props
+              rel
+            end
+            tx_methods :create_rel
 
 
-          def rels(match = {})
-            RelsIterator.new(self, match)
-          end
+            def rels(match = {})
+              RelsIterator.new(self, match)
+            end
 
-          def nodes(match = {})
-            NodesIterator.new(self, match)
-          end
+            def nodes(match = {})
+              NodesIterator.new(self, match)
+            end
 
-          def node(match = {})
-            rel = _rel(match)
-            rel && rel.other_node(self).wrapper
-          end
-          tx_methods :node
+            def node(match = {})
+              rel = _rel(match)
+              rel && rel.other_node(self).wrapper
+            end
+            tx_methods :node
 
-          def rel?(match = {})
-            _rels(match).has_next
-          end
-          tx_methods :rel?
+            def rel?(match = {})
+              _rels(match).has_next
+            end
+            tx_methods :rel?
 
-          def rel(match = {})
-            _rel(match)
-          end
-          tx_methods :rel
+            def rel(match = {})
+              _rel(match)
+            end
+            tx_methods :rel
 
-          def _rel(match = {})
-            dir, rel_type, between_id = _parse_match(match)
+            def _rel(match = {})
+              dir, rel_type, between_id = _parse_match(match)
 
-            rel = if rel_type
-                    get_single_relationship(rel_type, dir)
-                  else
-                    _get_single_relationship_by_dir(dir)
-                  end
+              rel = if rel_type
+                      get_single_relationship(rel_type, dir)
+                    else
+                      _get_single_relationship_by_dir(dir)
+                    end
 
-            rel if !(rel && between_id) || rel.other_node(self).neo_id == between_id
-          end
+              rel if !(rel && between_id) || rel.other_node(self).neo_id == between_id
+            end
 
-          def _get_single_relationship_by_dir(dir)
-            iter = get_relationships(dir).iterator
+            def _get_single_relationship_by_dir(dir)
+              iter = get_relationships(dir).iterator
 
-            return nil if not iter.has_next
+              return nil if not iter.has_next
 
-            first = iter.next
-            fail "Expected to only find one relationship from node #{neo_id} matching #{match.inspect}" if iter.has_next
-            first
-          end
+              first = iter.next
+              fail "Expected to only find one relationship from node #{neo_id} matching #{match.inspect}" if iter.has_next
+              first
+            end
 
-          def _rels(match = {})
-            dir, rel_type, between_id = _parse_match(match)
+            def _rels(match = {})
+              dir, rel_type, between_id = _parse_match(match)
 
-            args = rel_type ? [rel_type, dir] : [dir]
-            rels = get_relationships(*args).iterator
+              args = rel_type ? [rel_type, dir] : [dir]
+              rels = get_relationships(*args).iterator
 
-            if between_id
-              rels.find_all { |r| r.end_node.neo_id == between_id || r.start_node.neo_id == between_id }
-            else
-              rels
+              if between_id
+                rels.find_all { |r| r.end_node.neo_id == between_id || r.start_node.neo_id == between_id }
+              else
+                rels
+              end
             end
-          end
 
-          def _parse_match(match)
-            ::Neo4j::Node.validate_match!(match)
+            def _parse_match(match)
+              ::Neo4j::Node.validate_match!(match)
 
-            [
-              ToJava.dir_to_java(match[:dir] || :both),
-              ToJava.type_to_java(match[:type]),
-              match[:between] && match[:between].neo_id
-            ]
-          end
+              [
+                ToJava.dir_to_java(match[:dir] || :both),
+                ToJava.type_to_java(match[:type]),
+                match[:between] && match[:between].neo_id
+              ]
+            end
 
-          include Neo4j::Node::Wrapper
+            include Neo4j::Node::Wrapper
+          end
         end
       end
     end

data/lib/neo4j-embedded/embedded_relationship.rb

@@ -2,69 +2,71 @@ module Neo4j
   module Embedded
     class EmbeddedRelationship
       class << self
-        Java::OrgNeo4jKernelImplCore::RelationshipProxy.class_eval do
-          include Neo4j::Embedded::Property
-          include Neo4j::EntityEquality
-          include Neo4j::Relationship::Wrapper
-          include Neo4j::Core::ActiveEntity
-          extend Neo4j::Core::TxMethods
+        if !Neo4j::Core::Config.using_new_session?
+          Java::OrgNeo4jKernelImplCore::RelationshipProxy.class_eval do
+            include Neo4j::Embedded::Property
+            include Neo4j::EntityEquality
+            include Neo4j::Relationship::Wrapper
+            include Neo4j::Core::ActiveEntity
+            extend Neo4j::Core::TxMethods
 
-          alias_method :_other_node, :getOtherNode
+            alias_method :_other_node, :getOtherNode
 
-          def exist?
-            !!graph_database.get_relationship_by_id(neo_id)
-          rescue Java::OrgNeo4jGraphdb.NotFoundException
-            false
-          end
-          tx_methods :exist?
+            def exist?
+              !!graph_database.get_relationship_by_id(neo_id)
+            rescue Java::OrgNeo4jGraphdb.NotFoundException
+              false
+            end
+            tx_methods :exist?
 
-          def inspect
-            "EmbeddedRelationship neo_id: #{neo_id}"
-          end
+            def inspect
+              "EmbeddedRelationship neo_id: #{neo_id}"
+            end
 
-          def start_node
-            _start_node.wrapper
-          end
-          tx_methods :start_node
-          alias_method :_start_node_id, :start_node
-          tx_methods :_start_node_id
+            def start_node
+              _start_node.wrapper
+            end
+            tx_methods :start_node
+            alias_method :_start_node_id, :start_node
+            tx_methods :_start_node_id
 
-          def _start_node
-            getStartNode
-          end
+            def _start_node
+              getStartNode
+            end
 
-          def rel_type
-            @_rel_type ||= _rel_type
-          end
+            def rel_type
+              @_rel_type ||= _rel_type
+            end
 
-          def _rel_type
-            getType.name.to_sym
-          end
-          tx_methods :rel_type
+            def _rel_type
+              getType.name.to_sym
+            end
+            tx_methods :rel_type
 
-          def del
-            delete
-          end
-          tx_methods :del
-          tx_methods :delete
+            def del
+              delete
+            end
+            tx_methods :del
+            tx_methods :delete
 
-          alias_method :destroy, :del
-          tx_methods :destroy
+            alias_method :destroy, :del
+            tx_methods :destroy
 
-          def other_node(n)
-            _other_node(n.neo4j_obj).wrapper
-          end
-          tx_methods :other_node
+            def other_node(n)
+              _other_node(n.neo4j_obj).wrapper
+            end
+            tx_methods :other_node
 
-          def end_node
-            _end_node.wrapper
-          end
-          tx_methods :end_node
-          alias_method :_end_node_id, :end_node
-          tx_methods :_end_node_id
+            def end_node
+              _end_node.wrapper
+            end
+            tx_methods :end_node
+            alias_method :_end_node_id, :end_node
+            tx_methods :_end_node_id
 
-          def _end_node
-            getEndNode
+            def _end_node
+              getEndNode
+            end
           end
         end
       end