[CHEF-3499] remove data query and platform introspection from recipe dsl

4 files changed, 19 insertions, 5 deletions

diff --git a/chef/lib/chef/dsl/platform_introspection.rb b/chef/lib/chef/dsl/platform_introspection.rb
index 9b05cf38a4..211def2797 100644
--- a/chef/lib/chef/dsl/platform_introspection.rb
+++ b/chef/lib/chef/dsl/platform_introspection.rb
@@ -18,6 +18,10 @@
 
 class Chef
   module DSL
+
+    # == Chef::DSL::PlatformIntrospection
+    # Provides the DSL for platform-dependent switch logic, such as
+    # #value_for_platform.
     module PlatformIntrospection
 
       # Implementation class for determining platform dependent values
diff --git a/chef/lib/chef/dsl/recipe.rb b/chef/lib/chef/dsl/recipe.rb
index e1309ac22a..1bfe8da0e0 100644
--- a/chef/lib/chef/dsl/recipe.rb
+++ b/chef/lib/chef/dsl/recipe.rb
@@ -25,10 +25,12 @@ require 'chef/mixin/language'
 class Chef
   module DSL
 
+    # == Chef::DSL::Recipe
+    # Provides the primary recipe DSL functionality for defining Chef resource
+    # objects via method calls.
     module Recipe
 
       include Chef::Mixin::ConvertToClassName
-      include Chef::Mixin::Language
 
       def method_missing(method_symbol, *args, &block)
         # If we have a definition that matches, we want to use that instead.  This should
diff --git a/chef/lib/chef/mixin/language.rb b/chef/lib/chef/mixin/language.rb
index 2332f56bdc..3aa6a6d800 100644
--- a/chef/lib/chef/mixin/language.rb
+++ b/chef/lib/chef/mixin/language.rb
@@ -21,13 +21,15 @@ require 'chef/dsl/data_query'
 
 class Chef
   module Mixin
+
+    # == [DEPRECATED] Chef::Mixin::Language
+    # This module is deprecated and remains only for backwards compatibility.
+    #
+    # See Chef::DSL::PlatformIntrospection and Chef::DSL::DataQuery
     module Language
 
       include Chef::DSL::PlatformIntrospection
-
-      # TODO! uncomment
-      # include Chef::DSL::DataQuery
-
+      include Chef::DSL::DataQuery
 
     end
   end
diff --git a/chef/lib/chef/provider.rb b/chef/lib/chef/provider.rb
index b7f8b3dddc..7bbcc3b915 100644
--- a/chef/lib/chef/provider.rb
+++ b/chef/lib/chef/provider.rb
@@ -194,6 +194,12 @@ class Chef
 
           include Chef::DSL::Recipe
 
+          # These were previously provided by Chef::Mixin::RecipeDefinitionDSLCore.
+          # They are not included by its replacment, Chef::DSL::Recipe, but
+          # they may be used in existing LWRPs.
+          include Chef::DSL::PlatformIntrospection
+          include Chef::DSL::DataQuery
+
           def load_current_resource
             # silence Chef::Exceptions::Override exception
           end