Remove deprecated type parameter from searching request

Author: mauricebolhuis

opensearch-model/lib/opensearch/model/searching.rb

@@ -37,7 +37,6 @@ def initialize(klass, query_or_payload, options={})
           @options = options
 
           __index_name    = options[:index] || klass.index_name
-          __document_type = options[:type]  || klass.document_type
 
           case
             # search query: ...
@@ -54,9 +53,9 @@ def initialize(klass, query_or_payload, options={})
           end
 
           if body
-            @definition = { index: __index_name, type: __document_type, body: body }.update options
+            @definition = { index: __index_name, body: body }.update options
           else
-            @definition = { index: __index_name, type: __document_type, q: q }.update options
+            @definition = { index: __index_name, q: q }.update options
           end
         end
 
@@ -71,7 +70,7 @@ def execute!
 
       module ClassMethods
 
-        # Provides a `search` method for the model to easily search within an index/type
+        # Provides a `search` method for the model to easily search within an index
         # corresponding to the model settings.
         #
         # @param query_or_payload [String,Hash,Object] The search request definition

opensearch-model/spec/opensearch/model/response/pagination/kaminari_spec.rb

@@ -58,7 +58,7 @@ def self.document_type; 'bar'; end
       context 'when page is called once' do
 
         let(:search_request) do
-          { index: index_field, from: 25, size: 25, q: '*', type: type_field}
+          { index: index_field, from: 25, size: 25, q: '*'}
         end
 
         before do
@@ -75,11 +75,11 @@ def self.document_type; 'bar'; end
       context 'when page is called more than once' do
 
         let(:search_request_one) do
-          { index: index_field, from: 25, size: 25, q: '*', type: type_field}
+          { index: index_field, from: 25, size: 25, q: '*'}
         end
 
         let(:search_request_two) do
-          { index: index_field, from: 75, size: 25, q: '*', type: type_field}
+          { index: index_field, from: 75, size: 25, q: '*'}
         end
 
         before do
@@ -399,10 +399,6 @@ def self.document_type; 'bar'; end
         ModelClass
       end
 
-      let(:type_field) do
-        'bar'
-      end
-
       let(:index_field) do
         'foo'
       end
@@ -416,10 +412,6 @@ def self.document_type; 'bar'; end
         OpenSearch::Model::Multimodel.new(ModelClass)
       end
 
-      let(:type_field) do
-        ['bar']
-      end
-
       let(:index_field) do
         ['foo']
       end
@@ -441,10 +433,6 @@ def self.document_type; 'bar'; end
         ModelClass
       end
 
-      let(:type_field) do
-        'bar'
-      end
-
       let(:index_field) do
         'foo'
       end
@@ -458,10 +446,6 @@ def self.document_type; 'bar'; end
         OpenSearch::Model::Multimodel.new(ModelClass)
       end
 
-      let(:type_field) do
-        ['bar']
-      end
-
       let(:index_field) do
         ['foo']
       end

opensearch-model/spec/opensearch/model/searching_search_request_spec.rb

@@ -44,7 +44,7 @@ def self.document_type; 'bar'; end
     context 'when the search definition is a simple query' do
 
       before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', q: 'foo').and_return({})
+        expect(client).to receive(:search).with(index: 'foo', q: 'foo').and_return({})
       end
 
       let(:search) do
@@ -59,7 +59,7 @@ def self.document_type; 'bar'; end
     context 'when the search definition is a hash' do
 
       before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', body: { foo: 'bar' }).and_return({})
+        expect(client).to receive(:search).with(index: 'foo', body: { foo: 'bar' }).and_return({})
       end
 
       let(:search) do
@@ -74,7 +74,7 @@ def self.document_type; 'bar'; end
     context 'when the search definition is a json string' do
 
       before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', body: '{"foo":"bar"}').and_return({})
+        expect(client).to receive(:search).with(index: 'foo', body: '{"foo":"bar"}').and_return({})
       end
 
       let(:search) do
@@ -99,7 +99,7 @@ def to_hash; {foo: 'bar'}; end
       end
 
       before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', body: {foo: 'bar'}).and_return({})
+        expect(client).to receive(:search).with(index: 'foo', body: {foo: 'bar'}).and_return({})
       end
 
       let(:search) do
@@ -114,7 +114,7 @@ def to_hash; {foo: 'bar'}; end
     context 'when extra options are specified' do
 
       before do
-        expect(client).to receive(:search).with(index: 'foo', type: 'bar', q: 'foo', size: 15).and_return({})
+        expect(client).to receive(:search).with(index: 'foo', q: 'foo', size: 15).and_return({})
       end
 
       let(:search) do

opensearch-rails/spec/instrumentation_spec.rb

@@ -67,8 +67,7 @@ def self.document_type; 'bar'; end
                                                                         { klass: 'DummyInstrumentationModel',
                                                                           name: 'Search',
                                                                           search: { body: query,
-                                                                          index: 'foo',
-                                                                          type: 'bar' } }).and_return({})
+                                                                          index: 'foo'} }).and_return({})
     end
 
     let(:query) do