Remove 'Adapter' suffix from adapters since they are in Adapter:: namespace

lib/active_model/serializer.rb

@@ -77,7 +77,7 @@ module ActiveModel
     def self.adapter
       adapter_class = case config.adapter
                       when Symbol
-                        class_name = "ActiveModel::Serializer::Adapter::#{config.adapter.to_s.classify}Adapter"
+                        class_name = "ActiveModel::Serializer::Adapter::#{config.adapter.to_s.classify}"
                         if Object.const_defined?(class_name)
                           Object.const_get(class_name)
                         end

lib/active_model/serializer/adapter.rb

@@ -2,9 +2,9 @@ module ActiveModel
   class Serializer
     class Adapter
       extend ActiveSupport::Autoload
-      autoload :JsonAdapter
+      autoload :Json
-      autoload :NullAdapter
+      autoload :Null
-      autoload :JsonApiAdapter
+      autoload :JsonApi
 
       attr_reader :serializer
 

lib/active_model/serializer/adapter/json.rb

@@ -1,7 +1,7 @@
 module ActiveModel
   class Serializer
     class Adapter
-      class JsonAdapter < Adapter
+      class Json < Adapter
         def serializable_hash(options = {})
           serializer.attributes.each_with_object({}) do |(attr, value), h|
             h[attr] = value

lib/active_model/serializer/adapter/json_api.rb

@@ -1,7 +1,7 @@
 module ActiveModel
   class Serializer
     class Adapter
-      class JsonApiAdapter < Adapter
+      class JsonApi < Adapter
         def serializable_hash(options = {})
           @hash = serializer.attributes
 

lib/active_model/serializer/adapter/null.rb

@@ -1,7 +1,7 @@
 module ActiveModel
   class Serializer
     class Adapter
-      class NullAdapter < Adapter
+      class Null < Adapter
         def serializable_hash(options = {})
           {}
         end

test/adapter/json_api/belongs_to_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module ActiveModel
   class Serializer
     class Adapter
-      class JsonApiAdapter
+      class JsonApi
         class BelongsToTest < Minitest::Test
           def setup
             @post = Post.new(id: 42, title: 'New Post', body: 'Body')
@@ -12,7 +12,7 @@ module ActiveModel
             @comment.post = @post
 
             @serializer = CommentSerializer.new(@comment)
-            @adapter = ActiveModel::Serializer::Adapter::JsonApiAdapter.new(@serializer)
+            @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer)
           end
 
           def test_includes_post_id

test/adapter/json_api/has_many.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module ActiveModel
   class Serializer
     class Adapter
-      class JsonApiAdapter
+      class JsonApi
         class HasManyTest < Minitest::Test
           def setup
             @post = Post.new(title: 'New Post', body: 'Body')

test/adapter/json_test.rb

@@ -8,7 +8,7 @@ module ActiveModel
           @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
           @profile_serializer = ProfileSerializer.new(@profile)
 
-          @adapter = JsonAdapter.new(@profile_serializer)
+          @adapter = Json.new(@profile_serializer)
         end
 
         def test_serializable_hash

test/adapter/null_test.rb

@@ -3,12 +3,12 @@ require 'test_helper'
 module ActiveModel
   class Serializer
     class Adapter
-      class NullAdapterTest < Minitest::Test
+      class NullTest < Minitest::Test
         def setup
           profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
           serializer = ProfileSerializer.new(profile)
 
-          @adapter = NullAdapter.new(serializer)
+          @adapter = Null.new(serializer)
         end
 
         def test_serializable_hash

test/serializers/adapter_for_test.rb

@@ -11,23 +11,23 @@ module ActiveModel
 
       def test_returns_default_adapter
         adapter = ActiveModel::Serializer.adapter
-        assert_equal ActiveModel::Serializer::Adapter::JsonAdapter, adapter
+        assert_equal ActiveModel::Serializer::Adapter::Json, adapter
       end
 
       def test_overwrite_adapter_with_symbol
         ActiveModel::Serializer.config.adapter = :null
 
         adapter = ActiveModel::Serializer.adapter
-        assert_equal ActiveModel::Serializer::Adapter::NullAdapter, adapter
+        assert_equal ActiveModel::Serializer::Adapter::Null, adapter
       ensure
 
       end
 
       def test_overwrite_adapter_with_class
-        ActiveModel::Serializer.config.adapter = ActiveModel::Serializer::Adapter::NullAdapter
+        ActiveModel::Serializer.config.adapter = ActiveModel::Serializer::Adapter::Null
 
         adapter = ActiveModel::Serializer.adapter
-        assert_equal ActiveModel::Serializer::Adapter::NullAdapter, adapter
+        assert_equal ActiveModel::Serializer::Adapter::Null, adapter
       end
 
       def test_raises_exception_if_invalid_symbol_given