Shorten chef fs repo cookbooks dir class name

5 files changed, 9 insertions, 9 deletions

diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifacts_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifacts_dir.rb
index c7e2827346..47719beb50 100644
--- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifacts_dir.rb
+++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifacts_dir.rb
@@ -16,14 +16,14 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbooks_dir"
+require "chef/chef_fs/file_system/repository/cookbooks_dir"
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifact_dir"
 
 class Chef
   module ChefFS
     module FileSystem
       module Repository
-        class ChefRepositoryFileSystemCookbookArtifactsDir < ChefRepositoryFileSystemCookbooksDir
+        class ChefRepositoryFileSystemCookbookArtifactsDir < CookbooksDir
           def make_child_entry(child_name)
             ChefRepositoryFileSystemCookbookArtifactDir.new(child_name, self)
           end
diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb
index 9111b14747..2b98787183 100644
--- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb
+++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb
@@ -17,7 +17,7 @@
 #
 
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_entry"
-require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbooks_dir"
+require "chef/chef_fs/file_system/repository/cookbooks_dir"
 require "chef/chef_fs/file_system/not_found_error"
 
 class Chef
@@ -68,7 +68,7 @@ class Chef
             # Check chefignore
             ignorer = parent
             loop do
-              if ignorer.is_a?(ChefRepositoryFileSystemCookbooksDir)
+              if ignorer.is_a?(CookbooksDir)
                 # Grab the path from entry to child
                 path_to_child = name
                 child = self
diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb
index a1237cc429..1a67064a72 100644
--- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb
+++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb
@@ -18,7 +18,7 @@
 
 require "chef/chef_fs/file_system/base_fs_dir"
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_acls_dir"
-require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbooks_dir"
+require "chef/chef_fs/file_system/repository/cookbooks_dir"
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifacts_dir"
 require "chef/chef_fs/file_system/repository/data_bags_dir"
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_entry"
@@ -168,7 +168,7 @@ class Chef
               if versioned_cookbooks
                 dirs = paths.map { |path| ChefRepositoryFileSystemVersionedCookbooksDir.new(name, self, path) }
               else
-                dirs = paths.map { |path| ChefRepositoryFileSystemCookbooksDir.new(name, self, path) }
+                dirs = paths.map { |path| CookbooksDir.new(name, self, path) }
               end
             when "cookbook_artifacts"
               dirs = paths.map { |path| ChefRepositoryFileSystemCookbookArtifactsDir.new(name, self, path) }
diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbooks_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbooks_dir.rb
index d1371f1e9e..4299a63c2b 100644
--- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbooks_dir.rb
+++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbooks_dir.rb
@@ -16,14 +16,14 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbooks_dir"
+require "chef/chef_fs/file_system/repository/cookbooks_dir"
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir"
 
 class Chef
   module ChefFS
     module FileSystem
       module Repository
-        class ChefRepositoryFileSystemVersionedCookbooksDir < ChefRepositoryFileSystemCookbooksDir
+        class ChefRepositoryFileSystemVersionedCookbooksDir < CookbooksDir
           def make_child_entry(child_name)
             ChefRepositoryFileSystemVersionedCookbookDir.new(child_name, self)
           end
diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbooks_dir.rb b/lib/chef/chef_fs/file_system/repository/cookbooks_dir.rb
index 5e9c22741d..e1092f112b 100644
--- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbooks_dir.rb
+++ b/lib/chef/chef_fs/file_system/repository/cookbooks_dir.rb
@@ -26,7 +26,7 @@ class Chef
     module FileSystem
       module Repository
 
-        class ChefRepositoryFileSystemCookbooksDir < Repository::Directory
+        class CookbooksDir < Repository::Directory
 
           def chefignore
             @chefignore ||= Chef::Cookbook::Chefignore.new(self.file_path)