Fix warnings

JRuby-specific: fix 'warning: (...) interpreted as grouped expression'

lib/active_model/serializer/adapter.rb

@@ -1,13 +1,23 @@
-require 'active_model/serializer/adapter/fragment_cache'
-
 module ActiveModel
   class Serializer
     class Adapter
       extend ActiveSupport::Autoload
-      autoload :Json
+      require 'active_model/serializer/adapter/json'
+      require 'active_model/serializer/adapter/json_api'
       autoload :FlattenJson
       autoload :Null
-      autoload :JsonApi
+      autoload :FragmentCache
+
+      def self.create(resource, options = {})
+        override = options.delete(:adapter)
+        klass = override ? adapter_class(override) : ActiveModel::Serializer.adapter
+        klass.new(resource, options)
+      end
+
+      def self.adapter_class(adapter)
+        adapter_name = adapter.to_s.classify.sub("API", "Api")
+        "ActiveModel::Serializer::Adapter::#{adapter_name}".safe_constantize
+      end
 
       attr_reader :serializer
 
@@ -26,17 +36,6 @@ module ActiveModel
         hash
       end
 
-      def self.create(resource, options = {})
-        override = options.delete(:adapter)
-        klass = override ? adapter_class(override) : ActiveModel::Serializer.adapter
-        klass.new(resource, options)
-      end
-
-      def self.adapter_class(adapter)
-        adapter_name = adapter.to_s.classify.sub("API", "Api")
-        "ActiveModel::Serializer::Adapter::#{adapter_name}".safe_constantize
-      end
-
       def fragment_cache(*args)
         raise NotImplementedError, 'This is an abstract method. Should be implemented at the concrete adapter.'
       end

lib/active_model/serializer/adapter/json/fragment_cache.rb

@@ -1,3 +1,4 @@
+require 'active_model/serializer/adapter/fragment_cache'
 module ActiveModel
   class Serializer
     class Adapter
@@ -12,4 +13,4 @@ module ActiveModel
       end
     end
   end
-end
+end

lib/active_model/serializer/adapter/json_api/fragment_cache.rb

@@ -1,3 +1,4 @@
+require 'active_model/serializer/adapter/fragment_cache'
 module ActiveModel
   class Serializer
     class Adapter
@@ -20,4 +21,4 @@ module ActiveModel
       end
     end
   end
-end
+end

lib/active_model/serializer/associations.rb

@@ -73,11 +73,9 @@ module ActiveModel
         def associate(reflection)
           self._reflections = _reflections.dup
 
-          unless method_defined?(reflection.name)
-            define_method reflection.name do
-              object.send reflection.name
-            end
-          end
+          define_method reflection.name do
+            object.send reflection.name
+          end unless method_defined?(reflection.name)
 
           self._reflections << reflection
         end

lib/active_model/serializer/fieldset.rb

@@ -18,7 +18,9 @@ module ActiveModel
 
     private
 
+      ActiveModelSerializers.silence_warnings do
       attr_reader :raw_fields, :root
+      end
 
       def parsed_fields
         if raw_fields.is_a?(Hash)
@@ -37,4 +39,4 @@ module ActiveModel
 
     end
   end
-end
+end