active-fedora 13.3.0 → 14.0.0

data/lib/active_fedora/core.rb

@@ -47,11 +47,9 @@ module ActiveFedora
     #   to.
     # @note This can only be run on an unpersisted resource.
     def uri=(uri)
-      if persisted?
-        raise AlreadyPersistedError, "You can not set a URI for a persisted ActiveFedora object."
-      else
-        @ldp_source = build_ldp_resource(self.class.uri_to_id(uri))
-      end
+      raise AlreadyPersistedError, "You can not set a URI for a persisted ActiveFedora object." if persisted?
+
+      @ldp_source = build_ldp_resource(self.class.uri_to_id(uri))
     end
 
     # Reloads the object from Fedora.
@@ -132,9 +130,7 @@ module ActiveFedora
         # Returns a suitable string representation for :has_model
         # @deprecated use to_rdf_representation instead
         def to_class_uri(attrs = nil)
-          if attrs
-            Deprecation.warn ActiveFedora::Core, "to_class_uri no longer acceps an argument"
-          end
+          Deprecation.warn ActiveFedora::Core, "to_class_uri no longer acceps an argument" if attrs
           to_rdf_representation
         end
         deprecation_deprecate to_class_uri: "use 'to_rdf_representation()' instead"
@@ -159,11 +155,8 @@ module ActiveFedora
       end
 
       def check_persistence
-        if destroyed?
-          raise ActiveFedora::ObjectNotFoundError, "Can't reload an object that has been destroyed"
-        else
-          raise ActiveFedora::ObjectNotFoundError, "Can't reload an object that hasn't been saved"
-        end
+        raise ActiveFedora::ObjectNotFoundError, "Can't reload an object that has been destroyed" if destroyed?
+        raise ActiveFedora::ObjectNotFoundError, "Can't reload an object that hasn't been saved"
       end
   end
 end

data/lib/active_fedora/errors.rb

@@ -1,4 +1,4 @@
-module ActiveFedora #:nodoc:
+module ActiveFedora # :nodoc:
   # Generic ActiveFedora exception class
   class ActiveFedoraError < StandardError
   end
@@ -37,7 +37,7 @@ module ActiveFedora #:nodoc:
   class AssociationTypeMismatch < ActiveFedoraError
   end
 
-  class AssociationNotFoundError < ConfigurationError #:nodoc:
+  class AssociationNotFoundError < ConfigurationError # :nodoc:
   end
 
   # Raised when an object is loaded from Fedora by an incompatible class
@@ -47,7 +47,7 @@ module ActiveFedora #:nodoc:
   # This error is raised when trying to destroy a parent instance in N:1 or 1:1 associations
   # (has_many, has_one) when there is at least 1 child associated instance.
   # ex: if @project.tasks.size > 0, DeleteRestrictionError will be raised when trying to destroy @project
-  class DeleteRestrictionError < ActiveFedoraError #:nodoc:
+  class DeleteRestrictionError < ActiveFedoraError # :nodoc:
     def initialize(name = nil)
       if name
         super("Cannot delete record because of dependent #{name}")

data/lib/active_fedora/fedora.rb

@@ -54,9 +54,7 @@ module ActiveFedora
     end
 
     def connection
-      @connection ||= begin
-        build_connection
-      end
+      @connection ||= build_connection
     end
 
     def clean_connection
@@ -94,14 +92,12 @@ module ActiveFedora
       Faraday.new(host, options) do |conn|
         conn.response :encoding # use Faraday::Encoding middleware
         conn.adapter Faraday.default_adapter # net/http
-        conn.basic_auth(user, password)
+        conn.request :basic_auth, user, password
       end
     end
 
     def validate_options
-      unless host.downcase.end_with?("/rest")
-        ActiveFedora::Base.logger.warn "Fedora URL (#{host}) does not end with /rest. This could be a problem. Check your fedora.yml config"
-      end
+      ActiveFedora::Base.logger.warn "Fedora URL (#{host}) does not end with /rest. This could be a problem. Check your fedora.yml config" unless host.downcase.end_with?("/rest")
     end
 
     def ntriples_connection

data/lib/active_fedora/file/attributes.rb

@@ -18,9 +18,9 @@ module ActiveFedora::File::Attributes
   end
 
   def digest
-    response = metadata.ldp_source.graph.query(predicate: RDF::Vocab::PREMIS.hasMessageDigest)
+    response = metadata.ldp_source.graph.query({ predicate: RDF::Vocab::PREMIS.hasMessageDigest })
     # fallback on old predicate for checksum
-    response = metadata.ldp_source.graph.query(predicate: fallback_digest_predicate) if response.empty?
+    response = metadata.ldp_source.graph.query({ predicate: fallback_digest_predicate }) if response.empty?
     response.map(&:object)
   end
 
@@ -37,7 +37,7 @@ module ActiveFedora::File::Attributes
   end
 
   def has_content?
-    size && size > 0
+    size&.positive?
   end
 
   def empty?
@@ -46,12 +46,12 @@ module ActiveFedora::File::Attributes
 
   def create_date
     created = metadata.attributes["http://fedora.info/definitions/v4/repository#created"]
-    created && created.first
+    created&.first
   end
 
   def modified_date
     modified = metadata.attributes["http://fedora.info/definitions/v4/repository#lastModified"]
-    modified && modified.first
+    modified&.first
   end
 
   private

data/lib/active_fedora/file.rb

@@ -111,7 +111,7 @@ module ActiveFedora
     end
 
     def content_changed?
-      return true if new_record? && !local_or_remote_content(false).blank?
+      return true if new_record? && local_or_remote_content(false).present?
       local_or_remote_content(false) != @ds_content
     end
 

data/lib/active_fedora/file_configurator.rb

@@ -54,9 +54,7 @@ module ActiveFedora
     end
 
     def init(options = {})
-      if options.is_a?(String)
-        raise ArgumentError, "Calling ActiveFedora.init with a path as an argument has been removed.  Use ActiveFedora.init(:fedora_config_path=>#{options})"
-      end
+      raise ArgumentError, "Calling ActiveFedora.init with a path as an argument has been removed.  Use ActiveFedora.init(:fedora_config_path=>#{options})" if options.is_a?(String)
       reset!
       @config_options = options
       load_configs
@@ -108,7 +106,11 @@ module ActiveFedora
       end
 
       begin
-        fedora_yml = YAML.safe_load(config_erb, [], [], true) # allow YAML aliases
+        fedora_yml = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
+                       YAML.safe_load(config_erb, permitted_classes: [], permitted_symbols: [], aliases: true)
+                     else
+                       YAML.safe_load(config_erb, [], [], true) # allow YAML aliases
+                     end
       rescue Psych::SyntaxError => e
         raise "fedora.yml was found, but could not be parsed. " \
               "Error #{e.message}"
@@ -132,7 +134,11 @@ module ActiveFedora
       end
 
       begin
-        solr_yml = YAML.safe_load(config_erb, [], [], true) # allow YAML aliases
+        solr_yml = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
+                     YAML.safe_load(config_erb, permitted_classes: [], permitted_symbols: [], aliases: true)
+                   else
+                     YAML.safe_load(config_erb, [], [], true) # allow YAML aliases
+                   end
       rescue StandardError
         raise("solr.yml was found, but could not be parsed.\n")
       end
@@ -181,18 +187,14 @@ module ActiveFedora
         return config_path if ::File.file? config_path
       end
 
-      if ::File.file? "#{Dir.getwd}/config/#{config_type}.yml"
-        return "#{Dir.getwd}/config/#{config_type}.yml"
-      end
+      return "#{Dir.getwd}/config/#{config_type}.yml" if ::File.file? "#{Dir.getwd}/config/#{config_type}.yml"
 
       # Last choice, check for the default config file
       config_path = ::File.join(ActiveFedora.root, "config", "#{config_type}.yml")
-      if ::File.file? config_path
-        ActiveFedora::Base.logger.warn "Using the default #{config_type}.yml that comes with active-fedora.  If you want to override this, pass the path to #{config_type}.yml to ActiveFedora - ie. ActiveFedora.init(:#{config_type}_config_path => '/path/to/#{config_type}.yml') - or set Rails.root and put #{config_type}.yml into \#{Rails.root}/config."
-        return config_path
-      else
-        raise ConfigurationError, "Couldn't load #{config_type} config file!"
-      end
+      raise ConfigurationError, "Couldn't load #{config_type} config file!" unless ::File.file?(config_path)
+
+      ActiveFedora::Base.logger.warn "Using the default #{config_type}.yml that comes with active-fedora.  If you want to override this, pass the path to #{config_type}.yml to ActiveFedora - ie. ActiveFedora.init(:#{config_type}_config_path => '/path/to/#{config_type}.yml') - or set Rails.root and put #{config_type}.yml into \#{Rails.root}/config."
+      config_path
     end
 
     # Checks the existing fedora_config.path to see if there is a solr.yml there

data/lib/active_fedora/file_io.rb

@@ -49,7 +49,7 @@ module ActiveFedora
 
       if amount.nil?
         read_to_buf(nil, buf) # read the entire file, returns buf
-      elsif amount < 0
+      elsif amount.negative?
         raise(ArgumentError, "negative length #{amount} given")
       elsif amount.zero?
         ''
@@ -89,9 +89,7 @@ module ActiveFedora
     private
 
       def read_to_buf(amount, buf)
-        while (amount.nil? || buf.length < amount) && fill_buffer
-          buf << consume_buffer(amount.nil? ? nil : (amount - buf.length))
-        end
+        buf << consume_buffer(amount.nil? ? nil : (amount - buf.length)) while (amount.nil? || buf.length < amount) && fill_buffer
         buf
       end
 

data/lib/active_fedora/files_hash.rb

@@ -1,7 +1,7 @@
 module ActiveFedora
   class FilesHash < AssociationHash
-    def initialize(model)
-      @base = model
+    def initialize(model, reflections = nil)
+      super
     end
 
     def reflections

data/lib/active_fedora/fixity_service.rb

@@ -31,19 +31,19 @@ module ActiveFedora
     # An array of 1 or more literals reported by Fedora.
     # See 'success' for which one indicates fixity check is good.
     def status
-      fixity_graph.query(predicate: premis_status_predicate).map(&:object) +
-        fixity_graph.query(predicate: fedora_status_predicate).map(&:object)
+      fixity_graph.query({ predicate: premis_status_predicate }).map(&:object) +
+        fixity_graph.query({ predicate: fedora_status_predicate }).map(&:object)
     end
 
     # the currently calculated checksum, as a string URI, like
     # "urn:sha1:09a848b79f86f3a4f3f301b8baafde455d6f8e0e"
     def expected_message_digest
-      fixity_graph.query(predicate: ::RDF::Vocab::PREMIS.hasMessageDigest).first.try(:object).try(:to_s)
+      fixity_graph.query({ predicate: ::RDF::Vocab::PREMIS.hasMessageDigest }).first.try(:object).try(:to_s)
     end
 
     # integer, as reported by fedora. bytes maybe?
     def expected_size
-      fixity_graph.query(predicate: ::RDF::Vocab::PREMIS.hasSize).first.try(:object).try(:to_s).try(:to_i)
+      fixity_graph.query({ predicate: ::RDF::Vocab::PREMIS.hasSize }).first.try(:object).try(:to_s).try(:to_i)
     end
 
     # Fedora response as an ::RDF::Graph object. Public API, so consumers
@@ -83,7 +83,7 @@ module ActiveFedora
       # See https://jira.duraspace.org/browse/FCREPO-1247
       # @param [String] uri
       def encoded_url(uri)
-        if uri =~ /fcr:versions/
+        if /fcr:versions/.match?(uri)
           uri.gsub(/fcr:versions/, "fcr%3aversions")
         else
           uri

data/lib/active_fedora/identifiable.rb

@@ -7,29 +7,13 @@ module ActiveFedora
       # :singleton-method
       #
       # Accepts a proc that takes an id and transforms it to a URI
-      mattr_reader :translate_id_to_uri
-
-      # This method is mixed into ActiveFedora::Base and ActiveFedora::File, so don't
-      # overwrite the value if it's already set.
-      @@translate_id_to_uri ||= Core::FedoraIdTranslator
-
-      def self.translate_id_to_uri=(translator)
-        @@translate_id_to_uri = translator || Core::FedoraIdTranslator
-      end
+      mattr_accessor :translate_id_to_uri, default: Core::FedoraIdTranslator
 
       ##
       # :singleton-method
       #
       # Accepts a proc that takes a uri and transforms it to an id
-      mattr_reader :translate_uri_to_id
-
-      # This method is mixed into ActiveFedora::Base and ActiveFedora::File, so don't
-      # overwrite the value if it's already set.
-      @@translate_uri_to_id ||= Core::FedoraUriTranslator
-
-      def self.translate_uri_to_id=(translator)
-        @@translate_uri_to_id = translator || Core::FedoraUriTranslator
-      end
+      mattr_accessor :translate_uri_to_id, default: Core::FedoraUriTranslator
     end
 
     def id

data/lib/active_fedora/indexing/default_descriptors.rb

@@ -104,11 +104,9 @@ module ActiveFedora
         def dateable_converter
           lambda do |_type|
             lambda do |val|
-              begin
-                iso8601_date(Date.parse(val))
-              rescue ArgumentError
-                nil
-              end
+              iso8601_date(Date.parse(val))
+            rescue ArgumentError
+              nil
             end
           end
         end

data/lib/active_fedora/indexing/descendant_fetcher.rb

@@ -23,7 +23,7 @@ module ActiveFedora
       HAS_MODEL_PREDICATE = ActiveFedora::RDF::Fcrepo::Model.hasModel
 
       class_attribute :default_priority_models, instance_accessor: false
-      self.default_priority_models = %w(Hydra::AccessControl Hydra::AccessControl::Permissions).freeze
+      self.default_priority_models = %w[Hydra::AccessControl Hydra::AccessControl::Permissions].freeze
 
       attr_reader :uri, :priority_models
 
@@ -59,7 +59,7 @@ module ActiveFedora
 
         add_self_to_partitioned_uris unless @exclude_self
 
-        rdf_graph.query(predicate: ::RDF::Vocab::LDP.contains).each_object do |uri|
+        rdf_graph.query({ predicate: ::RDF::Vocab::LDP.contains }).each_object do |uri|
           descendant_uri = uri.to_s
           self.class.new(
             descendant_uri,
@@ -89,7 +89,7 @@ module ActiveFedora
         end
 
         def add_self_to_partitioned_uris
-          rdf_graph.query(predicate: HAS_MODEL_PREDICATE).each_object do |model|
+          rdf_graph.query({ predicate: HAS_MODEL_PREDICATE }).each_object do |model|
             next unless model.literal?
 
             partitioned_uris[model.to_s] ||= []

data/lib/active_fedora/indexing/descriptor.rb

@@ -37,7 +37,7 @@ module ActiveFedora
         end
 
         def converter(field_type)
-          @converter.call(field_type) if @converter
+          @converter&.call(field_type)
         end
     end
   end

data/lib/active_fedora/indexing/field_mapper.rb

@@ -122,11 +122,9 @@ module ActiveFedora
         # search through the descriptors (class attribute) until a module is found that responds to index_type, then call it.
         def index_type_macro(index_type)
           klass = self.class.descriptors.find { |descriptor_klass| descriptor_klass.respond_to? index_type }
-          if klass
-            klass.send(index_type)
-          else
-            raise UnknownIndexMacro, "Unable to find `#{index_type}' in #{self.class.descriptors}"
-          end
+          raise UnknownIndexMacro, "Unable to find `#{index_type}' in #{self.class.descriptors}" unless klass
+
+          klass.send(index_type)
         end
 
         def extract_type(value)

data/lib/active_fedora/indexing.rb

@@ -47,9 +47,11 @@ module ActiveFedora
     end
 
     # Updates Solr index with self.
+    # rubocop:disable Naming/VariableName
     def update_index
       SolrService.add(to_solr, softCommit: true)
     end
+    # rubocop:enable Naming/VariableName
 
     protected
 
@@ -91,6 +93,7 @@ module ActiveFedora
                             end
         end
 
+        # rubocop:disable Naming/VariableName
         # @param [Integer] batch_size - The number of Fedora objects to process for each SolrService.add call. Default 50.
         # @param [Boolean] softCommit - Do we perform a softCommit when we add the to_solr objects to SolrService. Default true.
         # @param [Boolean] progress_bar - If true output progress bar information. Default false.
@@ -113,7 +116,7 @@ module ActiveFedora
               batch.clear
             end
 
-            progress_bar_controller.increment if progress_bar_controller
+            progress_bar_controller&.increment
           end
 
           if batch.present?
@@ -121,11 +124,12 @@ module ActiveFedora
             batch.clear
           end
 
-          if final_commit
-            logger.debug "Solr hard commit..."
-            SolrService.commit
-          end
+          return unless final_commit
+
+          logger.debug "Solr hard commit..."
+          SolrService.commit
         end
+        # rubocop:enable Naming/VariableName
 
         def descendant_uris(uri, exclude_uri: false)
           DescendantFetcher.new(uri, exclude_self: exclude_uri).descendant_and_self_uris

data/lib/active_fedora/indexing_service.rb

@@ -47,13 +47,13 @@ module ActiveFedora
     protected
 
       def c_time
-        c_time = object.create_date.present? ? object.create_date : DateTime.now
+        c_time = object.create_date.presence || DateTime.now
         c_time = DateTime.parse(c_time) unless c_time.is_a?(DateTime)
         c_time
       end
 
       def m_time
-        m_time = object.modified_date.present? ? object.modified_date : DateTime.now
+        m_time = object.modified_date.presence || DateTime.now
         m_time = DateTime.parse(m_time) unless m_time.is_a?(DateTime)
         m_time
       end

data/lib/active_fedora/inheritance.rb

@@ -14,9 +14,7 @@ module ActiveFedora
       def base_class
         return File if self <= File
 
-        unless self <= Base
-          raise ActiveFedoraError, "#{name} doesn't belong in a hierarchy descending from ActiveFedora"
-        end
+        raise ActiveFedoraError, "#{name} doesn't belong in a hierarchy descending from ActiveFedora" unless self <= Base
 
         if self == Base || superclass == Base || superclass.abstract_class?
           self

data/lib/active_fedora/ldp_resource.rb

@@ -23,8 +23,8 @@ module ActiveFedora
 
     private
 
-    def response_as_graph(resp)
-      graph_class.new(subject_uri, data: resp.graph.data)
-    end
+      def response_as_graph(resp)
+        graph_class.new(subject_uri, data: resp.graph.data)
+      end
   end
 end

data/lib/active_fedora/loadable_from_json.rb

@@ -147,9 +147,11 @@ module ActiveFedora
       # @param attrs [Hash] attributes read from Solr
       # @return [Hash] the adapted attributes
       def adapt_attributes(attrs)
-        self.class.attribute_names.each_with_object({}) do |attribute_name, new_attributes|
-          new_attributes[attribute_name] = adapt_attribute_value(attrs, attribute_name)
+        result = {}
+        self.class.attribute_names.each do |attribute_name|
+          result[attribute_name] = adapt_attribute_value(attrs, attribute_name)
         end
+        result
       end
 
       # Adapts a single attribute from the given attributes hash to fit the data
@@ -194,7 +196,7 @@ module ActiveFedora
       # @return [Object] the adapted value
       def adapt_single_attribute_value(value, attribute_name)
         if value && date_attribute?(attribute_name)
-          return nil unless value.present?
+          return nil if value.blank?
           DateTime.parse(value)
         else
           value

data/lib/active_fedora/model_classifier.rb

@@ -69,9 +69,9 @@ module ActiveFedora
       def class_exists?(class_name)
         return false if class_name.empty?
         klass = class_name.constantize
-        return klass.is_a?(Class)
+        klass.is_a?(Class)
       rescue NameError
-        return false
+        false
       end
   end
 end

data/lib/active_fedora/nested_attributes.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/object/blank'
 
 module ActiveFedora
-  module NestedAttributes #:nodoc:
+  module NestedAttributes # :nodoc:
     class TooManyRecords < RuntimeError
     end
 
@@ -160,7 +160,7 @@ module ActiveFedora
 
       # Attribute hash keys that should not be assigned as normal attributes.
       # These hash keys are nested attributes implementation details.
-      UNASSIGNABLE_KEYS = %w(id _destroy).freeze
+      UNASSIGNABLE_KEYS = %w[id _destroy].freeze
 
       # Assigns the given attributes to the association.
       #
@@ -182,7 +182,7 @@ module ActiveFedora
         attributes = attributes.with_indifferent_access
         existing_record = send(association_name)
 
-        if (options[:update_only] || !attributes['id'].blank?) && existing_record &&
+        if (options[:update_only] || attributes['id'].present?) && existing_record &&
            (options[:update_only] || existing_record.id.to_s == attributes['id'].to_s)
           assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy]) unless call_reject_if(association_name, attributes)
 
@@ -192,16 +192,14 @@ module ActiveFedora
         elsif !reject_new_record?(association_name, attributes)
           assignable_attributes = attributes.except(*UNASSIGNABLE_KEYS)
 
-          if existing_record && existing_record.new_record?
+          if existing_record&.new_record?
             existing_record.assign_attributes(assignable_attributes)
             association(association_name).initialize_attributes(existing_record)
           else
             method = "build_#{association_name}"
-            if respond_to?(method)
-              send(method, assignable_attributes)
-            else
-              raise ArgumentError, "Cannot build association `#{association_name}'. Are you trying to build a polymorphic one-to-one association?"
-            end
+            raise ArgumentError, "Cannot build association `#{association_name}'. Are you trying to build a polymorphic one-to-one association?" unless respond_to?(method)
+
+            send(method, assignable_attributes)
           end
         end
       end
@@ -209,13 +207,9 @@ module ActiveFedora
       def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
         options = nested_attributes_options[association_name]
 
-        if attributes_collection.respond_to?(:permitted?)
-          attributes_collection = attributes_collection.to_h
-        end
+        attributes_collection = attributes_collection.to_h if attributes_collection.respond_to?(:permitted?)
 
-        unless attributes_collection.is_a?(Hash) || attributes_collection.is_a?(Array)
-          raise ArgumentError, "Hash or Array expected, got #{attributes_collection.class.name} (#{attributes_collection.inspect})"
-        end
+        raise ArgumentError, "Hash or Array expected, got #{attributes_collection.class.name} (#{attributes_collection.inspect})" unless attributes_collection.is_a?(Hash) || attributes_collection.is_a?(Array)
 
         check_record_limit!(options[:limit], attributes_collection)
 
@@ -242,16 +236,12 @@ module ActiveFedora
           attributes = attributes.with_indifferent_access
 
           if attributes['id'].blank?
-            unless reject_new_record?(association_name, attributes)
-              association.build(attributes.except(*UNASSIGNABLE_KEYS))
-            end
+            association.build(attributes.except(*UNASSIGNABLE_KEYS)) unless reject_new_record?(association_name, attributes)
 
           elsif existing_record = existing_records.detect { |record| record.id.to_s == attributes['id'].to_s }
             association.send(:add_record_to_target_with_callbacks, existing_record) if !association.loaded? && !call_reject_if(association_name, attributes)
 
-            unless call_reject_if(association_name, attributes)
-              assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy])
-            end
+            assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy]) unless call_reject_if(association_name, attributes)
 
           else
             raise_nested_attributes_record_not_found!(association_name, attributes['id'])

data/lib/active_fedora/null_logger.rb

@@ -1,6 +1,8 @@
 module ActiveFedora
   class NullLogger < Logger
+    # rubocop:disable Lint/MissingSuper
     def initialize(*); end
+    # rubocop:enable Lint/MissingSuper
 
     # allows all the usual logger method calls (warn, info, error, etc.)
     def add(*); end

data/lib/active_fedora/orders/list_node.rb

@@ -1,8 +1,7 @@
 module ActiveFedora::Orders
   class ListNode
     attr_reader :rdf_subject
-    attr_accessor :prev, :next, :target
-    attr_writer :next_uri, :prev_uri
+    attr_writer :prev, :next, :target, :next_uri, :prev_uri
     attr_accessor :proxy_in, :proxy_for
     def initialize(node_cache, rdf_subject, graph = RDF::Repository.new)
       @rdf_subject = rdf_subject
@@ -120,7 +119,7 @@ module ActiveFedora::Orders
     end
 
     def new_record?
-      @target && @target.new_record?
+      @target&.new_record?
     end
 
     private