Removed duplicate code in thread pools.

Author: jdantonio

lib/concurrent/java_cached_thread_pool.rb

@@ -7,29 +7,27 @@ module Concurrent
     # @!macro cached_thread_pool
     class JavaCachedThreadPool < JavaThreadPoolExecutor
 
-      # The maximum number of threads that may be created in the pool
-      # (unless overridden during construction).
-      DEFAULT_MAX_POOL_SIZE = java.lang.Integer::MAX_VALUE # 2147483647
-
-      # The maximum number of seconds a thread in the pool may remain idle before
-      # being reclaimed (unless overridden during construction).
-      DEFAULT_THREAD_IDLETIME = 60
-
-      # The maximum number of threads that may be created in the pool.
-      attr_reader :max_length
-
       # Create a new thread pool.
       #
+      # @param [Hash] opts the options defining pool behavior.
+      # @option opts [Integer] :max_threads (+DEFAULT_MAX_POOL_SIZE+) maximum number
+      #   of threads which may be created in the pool
+      # @option opts [Integer] :idletime (+DEFAULT_THREAD_IDLETIMEOUT+) maximum
+      #   number of seconds a thread may be idle before it is reclaimed
+      #
+      # @raise [ArgumentError] if +max_threads+ is less than or equal to zero
+      # @raise [ArgumentError] if +thread_idletime+ is less than or equal to zero
+      #
       # @see http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Executors.html#newCachedThreadPool--
       def initialize(opts = {})
-        idletime = (opts[:thread_idletime] || opts[:idletime] || DEFAULT_THREAD_IDLETIME).to_i
-        raise ArgumentError.new('idletime must be greater than zero') if idletime <= 0
+        max_length = opts.fetch(:max_threads, DEFAULT_MAX_POOL_SIZE).to_i
+        idletime = opts.fetch(:idletime, DEFAULT_THREAD_IDLETIMEOUT).to_i
 
-        @max_length = opts[:max_threads] || opts[:max] || DEFAULT_MAX_POOL_SIZE
-        raise ArgumentError.new('maximum_number of threads must be greater than zero') if @max_length <= 0
+        raise ArgumentError.new('idletime must be greater than zero') if idletime <= 0
+        raise ArgumentError.new('max_threads must be greater than zero') if max_length <= 0
 
         @executor = java.util.concurrent.ThreadPoolExecutor.new(
-          0, @max_length,
+          0, max_length,
           idletime, java.util.concurrent.TimeUnit::SECONDS,
           java.util.concurrent.SynchronousQueue.new,
           java.util.concurrent.ThreadPoolExecutor::AbortPolicy.new)

lib/concurrent/java_fixed_thread_pool.rb

@@ -12,11 +12,10 @@ class JavaFixedThreadPool < JavaThreadPoolExecutor
       #
       # @see http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Executors.html#newFixedThreadPool-int-
       def initialize(num_threads = Concurrent::processor_count)
-        @num_threads = num_threads.to_i
-        raise ArgumentError.new('number of threads must be greater than zero') if @num_threads < 1
+        raise ArgumentError.new('number of threads must be greater than zero') if num_threads < 1
 
         @executor = java.util.concurrent.ThreadPoolExecutor.new(
-          @num_threads, @num_threads,
+          num_threads, num_threads,
           0, java.util.concurrent.TimeUnit::SECONDS,
           java.util.concurrent.LinkedBlockingQueue.new,
           java.util.concurrent.ThreadPoolExecutor::AbortPolicy.new)

lib/concurrent/ruby_cached_thread_pool.rb

@@ -10,7 +10,7 @@ class RubyCachedThreadPool < RubyThreadPoolExecutor
     # @param [Hash] opts the options defining pool behavior.
     # @option opts [Integer] :max_threads (+DEFAULT_MAX_POOL_SIZE+) maximum number
     #   of threads which may be created in the pool
-    # @option opts [Integer] :idletime (+DEFAULT_THREAD_IDLETIME+) maximum
+    # @option opts [Integer] :idletime (+DEFAULT_THREAD_IDLETIMEOUT+) maximum
     #   number of seconds a thread may be idle before it is reclaimed
     #
     # @raise [ArgumentError] if +max_threads+ is less than or equal to zero