Remove deprecated type parameter from importing request

Author: mauricebolhuis

opensearch-model/lib/opensearch/model/importing.rb

@@ -99,9 +99,9 @@ module ClassMethods
         #
         #    Article.import refresh: true
         #
-        # @example Import the records into a different index/type than the default one
+        # @example Import the records into a different index than the default one
         #
-        #    Article.import index: 'my-new-index', type: 'my-other-type'
+        #    Article.import index: 'my-new-index'
         #
         # @example Pass an ActiveRecord scope to limit the imported records
         #
@@ -141,7 +141,6 @@ def import(options={}, &block)
           errors       = []
           refresh      = options.delete(:refresh)   || false
           target_index = options.delete(:index)     || index_name
-          target_type  = options.delete(:type)      || document_type
           transform    = options.delete(:transform) || __transform
           pipeline     = options.delete(:pipeline)
           return_value = options.delete(:return)    || 'count'
@@ -161,7 +160,6 @@ def import(options={}, &block)
           __find_in_batches(options) do |batch|
             params = {
               index: target_index,
-              type:  target_type,
               body:  __batch_to_bulk(batch, transform)
             }
 

opensearch-model/spec/opensearch/model/importing_spec.rb

@@ -60,7 +60,6 @@ def importing_mixin
 
     before do
       allow(DummyImportingModel).to receive(:index_name).and_return('foo')
-      allow(DummyImportingModel).to receive(:document_type).and_return('foo')
       allow(DummyImportingModel).to receive(:index_exists?).and_return(true)
       allow(DummyImportingModel).to receive(:__batch_to_bulk)
       allow(client).to receive(:bulk).and_return(response)
@@ -159,26 +158,14 @@ def importing_mixin
 
       before do
         expect(DummyImportingModel).to receive(:client).and_return(client)
-        expect(client).to receive(:bulk).with(body: nil, index: 'my-new-index', type: 'foo').and_return(response)
+        expect(client).to receive(:bulk).with(body: nil, index: 'my-new-index').and_return(response)
       end
 
       it 'uses the alternate index name' do
         expect(DummyImportingModel.import(index: 'my-new-index')).to eq(0)
       end
     end
 
-    context 'when a different document type is provided' do
-
-      before do
-        expect(DummyImportingModel).to receive(:client).and_return(client)
-        expect(client).to receive(:bulk).with(body: nil, index: 'foo', type: 'my-new-type').and_return(response)
-      end
-
-      it 'uses the alternate index name' do
-        expect(DummyImportingModel.import(type: 'my-new-type')).to eq(0)
-      end
-    end
-
     context 'the transform method' do
 
       before do
@@ -232,7 +219,7 @@ def importing_mixin
 
       before do
         expect(DummyImportingModel).to receive(:client).and_return(client)
-        expect(client).to receive(:bulk).with(body: nil, index: 'foo', type: 'foo', pipeline: 'my-pipeline').and_return(response)
+        expect(client).to receive(:bulk).with(body: nil, index: 'foo', pipeline: 'my-pipeline').and_return(response)
       end
 
       it 'uses the pipeline option' do