Remove all commented code from cheffs data dir

1 files changed, 3 insertions, 302 deletions

diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_data_bags_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_data_bags_dir.rb
index ced97439e2..2edefa1e1b 100644
--- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_data_bags_dir.rb
+++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_data_bags_dir.rb
@@ -24,140 +24,22 @@ class Chef
     module FileSystem
       module Repository
 
-        # Original Class/superclass
-        #class ChefRepositoryFileSystemDataBagsDir < ChefRepositoryFileSystemEntry
-
-        # With ChefRepositoryFileSystemEntry inlined:
-        #class ChefRepositoryFileSystemDataBagsDir < FileSystemEntry
-
-        # With FileSystemEntry inlined
-        # class ChefRepositoryFileSystemDataBagsDir < BaseFSDir
-
-        # With BaseFSDir inlined
-        # class ChefRepositoryFileSystemDataBagsDir < BaseFSObject
-
-        # With BaseFSObject inlined
         class ChefRepositoryFileSystemDataBagsDir
 
           attr_reader :data_handler
 
-          # Original
-          ## def initialize(name, parent, path = nil)
-          ##   super(name, parent, path, Chef::ChefFS::DataHandler::DataBagItemDataHandler.new)
-          ## end
-
-          # ChefRepositoryFileSystemEntry#initialize
-          ## def initialize(name, parent, file_path = nil, data_handler = nil)
-          ##   super(name, parent, file_path)
-          ##   @data_handler = data_handler
-          ## end
-
-          # FileSystemEntry#initialize
-          ## def initialize(name, parent, file_path = nil)
-          ##   super(name, parent)
-          ##   @file_path = file_path || "#{parent.file_path}/#{name}"
-          ## end
-
-          # BaseFSObject#initialize
-          ## def initialize(name, parent)
-          ##   @parent = parent
-          ##   @name = name
-          ##   if parent
-          ##     @path = Chef::ChefFS::PathUtils::join(parent.path, name)
-          ##   else
-          ##     if name != ""
-          ##       raise ArgumentError, "Name of root object must be empty string: was '#{name}' instead"
-          ##     end
-          ##     @path = "/"
-          ##   end
-          ## end
-
-          # inlined initialize
-          #
-          # original method signature: def initialize(name, parent, file_path = nil)
-          #
-          # the only caller of this should never give a nil path
           def initialize(name, parent, file_path)
             @parent = parent
             @name = name
-            # We are not root, don't need to handle that case
-            ##if parent
-              @path = Chef::ChefFS::PathUtils::join(parent.path, name)
-            ##else
-            ##  if name != ""
-            ##    raise ArgumentError, "Name of root object must be empty string: was '#{name}' instead"
-            ##  end
-            ##  @path = "/"
-            ##end
-            @file_path = file_path # || "#{parent.file_path}/#{name}"
+            @path = Chef::ChefFS::PathUtils::join(parent.path, name)
+            @file_path = file_path
             @data_handler = Chef::ChefFS::DataHandler::DataBagItemDataHandler.new
           end
 
-
-          ##############################
-          # Original
-          ##############################
-
           def can_have_child?(name, is_dir)
             is_dir && !name.start_with?(".")
           end
 
-          ##############################
-          # Inlined from ChefRepositoryFileSystemEntry
-          ##############################
-
-          # Inherited from ChefRepositoryFileSystemEntry, but apparently unused
-          ## def write_pretty_json=(value)
-          ##   @write_pretty_json = value
-          ## end
-
-          # Inherited from ChefRepositoryFileSystemEntry, but apparently unused
-          ## def write_pretty_json
-          ##   @write_pretty_json.nil? ? root.write_pretty_json : @write_pretty_json
-          ## end
-
-          # Inherited from ChefRepositoryFileSystemEntry, but has different behavior here:
-          ## def data_handler
-          ##   @data_handler || parent.data_handler
-          ## end
-
-          # Inlined version of the above
-          # Seems like this has to be important, but where is it used?
-          ##def data_handler
-          ##  @data_handler
-          ##end
-
-          # Inherited from ChefRepositoryFileSystemEntry, but apparently unused
-          ## def chef_object
-          ##   begin
-          ##     return data_handler.chef_object(Chef::JSONCompat.parse(read))
-          ##   rescue
-          ##     Chef::Log.error("Could not read #{path_for_printing} into a Chef object: #{$!}")
-          ##   end
-          ##   nil
-          ## end
-
-          # Overridden by subclass
-          ## def can_have_child?(name, is_dir)
-          ##   !is_dir && name[-5..-1] == ".json"
-          ## end
-
-          # Inherited from ChefRepositoryFileSystemEntry, but apparently unused
-          ## def write(file_contents)
-          ##   if file_contents && write_pretty_json && name[-5..-1] == ".json"
-          ##     file_contents = minimize(file_contents, self)
-          ##   end
-          ##   super(file_contents)
-          ## end
-
-          # Inherited from ChefRepositoryFileSystemEntry, but apparently unused
-          ## def minimize(file_contents, entry)
-          ##   object = Chef::JSONCompat.parse(file_contents)
-          ##   object = data_handler.normalize(object, entry)
-          ##   object = data_handler.minimize(object, entry)
-          ##   Chef::JSONCompat.to_json_pretty(object)
-          ## end
-
           protected
 
           def make_child_entry(child_name)
@@ -166,10 +48,6 @@ class Chef
 
           public
 
-          ##############################
-          # Inlined from FileSystemEntry
-          ##############################
-
           attr_reader :file_path
 
           def path_for_printing
@@ -177,7 +55,6 @@ class Chef
           end
 
           def children
-            # Except cookbooks and data bag dirs, all things must be json files
             begin
               Dir.entries(file_path).sort.
                   map { |child_name| make_child_entry(child_name) }.
@@ -187,25 +64,6 @@ class Chef
             end
           end
 
-          # Inherited from FileSystemEntry but has extra cases we cannot hit all the cases
-          ## def create_child(child_name, file_contents=nil)
-          ##   child = make_child_entry(child_name)
-          ##   if child.exists?
-          ##     raise Chef::ChefFS::FileSystem::AlreadyExistsError.new(:create_child, child)
-          ##   end
-          ##   if file_contents
-          ##     child.write(file_contents)
-          ##   else
-          ##     begin
-          ##       Dir.mkdir(child.file_path)
-          ##     rescue Errno::EEXIST
-          ##       raise Chef::ChefFS::FileSystem::AlreadyExistsError.new(:create_child, child)
-          ##     end
-          ##   end
-          ##   child
-          ## end
-
-          # Inherited from FileSystemEntry, modified to remove code we can't hit
           def create_child(child_name, file_contents=nil)
             child = make_child_entry(child_name)
             if child.exists?
@@ -219,33 +77,6 @@ class Chef
             child
           end
 
-          # Inherited from FileSystemEntry but this is a data bag dir, it should always be a dir
-          ## def dir?
-          ##   File.directory?(file_path)
-          ## end
-
-          # Inherited from FileSystemEntry but with other stuff inlined we don't need it any more
-          ## def dir?
-          ##   true
-          ## end
-
-          # Inherited from FileSystemEntry but it seems we cannot hit all of these cases
-          ## def delete(recurse)
-          ##   begin
-          ##     if dir?
-          ##       if !recurse
-          ##         raise MustDeleteRecursivelyError.new(self, $!)
-          ##       end
-          ##       FileUtils.rm_r(file_path)
-          ##     else
-          ##       File.delete(file_path)
-          ##     end
-          ##   rescue Errno::ENOENT
-          ##     raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
-          ##   end
-          ## end
-
-          # Inherited from FileSystemEntry but it seems we cannot hit all of these cases
           def delete(recurse)
             if exists?
               if !recurse
@@ -257,82 +88,19 @@ class Chef
             end
           end
 
-
-          # Inherited from FileSystemEntry but it seems we cannot hit all of these cases
-          ## def exists?
-          ##   File.exists?(file_path) && (parent.nil? || parent.can_have_child?(name, dir?))
-          ## end
-
-          # Inherited from FileSystemEntry but there are extra cases we don't seem to hit
           def exists?
-            File.exists?(file_path) # && (parent.nil? || parent.can_have_child?(name, dir?))
+            File.exists?(file_path)
           end
 
-          # Inherited from FileSystemEntry but seems unused
-          ## def read
-          ##   begin
-          ##     File.open(file_path, "rb") {|f| f.read}
-          ##   rescue Errno::ENOENT
-          ##     raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
-          ##   end
-          ## end
-
-          # Inherited from FileSystemEntry but seems unused
-          ## def write(content)
-          ##   File.open(file_path, "wb") do |file|
-          ##     file.write(content)
-          ##   end
-          ## end
-
-          # Overridden in superclass (ChefRepositoryFileSystemEntry)
-          ## protected
-
-          ## def make_child_entry(child_name)
-          ##   FileSystemEntry.new(child_name, self)
-          ## end
-
-          ##############################
-          # Inlined from BaseFSDir
-          ##############################
-
-          # trivial initializer
-          ## def initialize(name, parent)
-          ##   super
-          ## end
-
-          # overridden in superclass
-          ## def dir?
-          ##   true
-          ## end
-
-          # overridden in superclass
-          ## def can_have_child?(name, is_dir)
-          ##   true
-          ## end
-
           # An empty children array is an empty dir
           def empty?
             children.empty?
           end
 
-          ##############################
-          # Inlined from BaseFSObject
-          ##############################
-
           attr_reader :name
           attr_reader :parent
           attr_reader :path
 
-          # unused?
-          ## def compare_to(other)
-          ##   nil
-          ## end
-
-          # overridden in subclass
-          ## def can_have_child?(name, is_dir)
-          ##   false
-          ## end
-
           def child(name)
             if can_have_child?(name, true) || can_have_child?(name, false)
               result = make_child_entry(name)
@@ -340,77 +108,10 @@ class Chef
             result || NonexistentFSObject.new(name, self)
           end
 
-
-          # overridden in subclass
-          ## def children
-          ##   raise NotFoundError.new(self) if !exists?
-          ##   []
-          ## end
-
-          # Seems unused
-          ## def chef_object
-          ##   raise NotFoundError.new(self) if !exists?
-          ##   nil
-          ## end
-
-          # overridden in subclass
-          ##def create_child(name, file_contents)
-          ##  raise NotFoundError.new(self) if !exists?
-          ##  raise OperationNotAllowedError.new(:create_child, self)
-          ##end
-
-          # overridden in subclass
-          ## def delete(recurse)
-          ##   raise NotFoundError.new(self) if !exists?
-          ##   raise OperationNotAllowedError.new(:delete, self)
-          ## end
-
-          # overridden in subclass, seems unused?
-          ##def dir?
-          ##  false
-          ##end
-
-          # overridden in subclass
-          ## def exists?
-          ##   true
-          ## end
-
-          # overridden in subclass
-          ## def path_for_printing
-          ##   if parent
-          ##     parent_path = parent.path_for_printing
-          ##     if parent_path == "."
-          ##       name
-          ##     else
-          ##       Chef::ChefFS::PathUtils::join(parent.path_for_printing, name)
-          ##     end
-          ##   else
-          ##     name
-          ##   end
-          ## end
-
-          # Cannot hit all of these cases
-          ## def root
-          ##   parent ? parent.root : self
-          ## end
-
-          # the only branch we can hit
           def root
             parent.root
           end
 
-          # unused
-          ## def read
-          ##   raise NotFoundError.new(self) if !exists?
-          ##   raise OperationNotAllowedError.new(:read, self)
-          ## end
-
-          # unused
-          ## def write(file_contents)
-          ##   raise NotFoundError.new(self) if !exists?
-          ##   raise OperationNotAllowedError.new(:write, self)
-          ## end
-
         end
 
       end