cassandra-driver 3.0.0.beta.1-java → 3.0.0-java

data/lib/cassandra/protocol/responses/read_timeout_error_response.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,14 @@ module Cassandra
     class ReadTimeoutErrorResponse < ErrorResponse
       attr_reader :consistency, :received, :blockfor, :data_present
 
-      def initialize(custom_payload, warnings, code, message, consistency, received, blockfor, data_present)
+      def initialize(custom_payload,
+                     warnings,
+                     code,
+                     message,
+                     consistency,
+                     received,
+                     blockfor,
+                     data_present)
         super(custom_payload, warnings, code, message)
 
         @consistency  = consistency
@@ -31,7 +38,19 @@ module Cassandra
       end
 
       def to_error(keyspace, statement, options, hosts, consistency, retries)
-        Errors::ReadTimeoutError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @data_present, @consistency, @blockfor, @received)
+        Errors::ReadTimeoutError.new(@message,
+                                     @custom_payload,
+                                     @warnings,
+                                     keyspace,
+                                     statement,
+                                     options,
+                                     hosts,
+                                     consistency,
+                                     retries,
+                                     @data_present,
+                                     @consistency,
+                                     @blockfor,
+                                     @received)
       end
 
       def to_s

data/lib/cassandra/protocol/responses/ready_response.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,10 +19,13 @@
 module Cassandra
   module Protocol
     class ReadyResponse < Response
+      # @private
+      RESPONSE_TYPES[0x02] = self
+
       def eql?(rs)
-        self.class === rs
+        rs.is_a?(self.class)
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash
         @h ||= begin
@@ -35,10 +38,6 @@ module Cassandra
       def to_s
         'READY'
       end
-
-      private
-
-      RESPONSE_TYPES[0x02] = self
     end
   end
 end

data/lib/cassandra/protocol/responses/result_response.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,23 +19,24 @@
 module Cassandra
   module Protocol
     class ResultResponse < Response
+      # @private
+      RESPONSE_TYPES[0x08] = self
+      # @private
+      RESULT_TYPES = [
+        # populated by subclasses
+      ]
+
       attr_reader :custom_payload, :warnings, :trace_id
 
       def initialize(custom_payload, warnings, trace_id)
-        @custom_payload, @warnings, @trace_id = custom_payload, warnings, trace_id
+        @custom_payload = custom_payload
+        @warnings = warnings
+        @trace_id = trace_id
       end
 
       def void?
         false
       end
-
-      private
-
-      RESPONSE_TYPES[0x08] = self
-
-      RESULT_TYPES = [
-        # populated by subclasses
-      ]
     end
   end
 end

data/lib/cassandra/protocol/responses/rows_result_response.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,20 +19,21 @@
 module Cassandra
   module Protocol
     class RowsResultResponse < ResultResponse
+      # @private
+      RESULT_TYPES[0x02] = self
+
       attr_reader :rows, :metadata, :paging_state
 
       def initialize(custom_payload, warnings, rows, metadata, paging_state, trace_id)
         super(custom_payload, warnings, trace_id)
-        @rows, @metadata, @paging_state = rows, metadata, paging_state
+        @rows = rows
+        @metadata = metadata
+        @paging_state = paging_state
       end
 
       def to_s
-        %(RESULT ROWS #@metadata #@rows)
+        %(RESULT ROWS #{@metadata} #{@rows})
       end
-
-      private
-
-      RESULT_TYPES[0x02] = self
     end
   end
 end

data/lib/cassandra/protocol/responses/schema_change_event_response.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,6 +21,9 @@ module Cassandra
     class SchemaChangeEventResponse < EventResponse
       TYPE = 'SCHEMA_CHANGE'.freeze
 
+      # @private
+      EVENT_TYPES[TYPE] = self
+
       attr_reader :change, :keyspace, :name, :target, :arguments
 
       def initialize(change, keyspace, name, target, arguments)
@@ -43,7 +46,7 @@ module Cassandra
           @target == other.target &&
           @arguments == other.arguments
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash
         @h ||= begin
@@ -59,15 +62,12 @@ module Cassandra
 
       def to_s
         if @arguments
-          %(EVENT SCHEMA_CHANGE #@change #@target "#@keyspace" "#@name" #@arguments)
+          %(EVENT SCHEMA_CHANGE #{@change} #{@target} "#{@keyspace}" "#{@name}" ) \
+              "#{@arguments}"
         else
-          %(EVENT SCHEMA_CHANGE #@change #@target "#@keyspace" "#@name")
+          %(EVENT SCHEMA_CHANGE #{@change} #{@target} "#{@keyspace}" "#{@name}")
         end
       end
-
-      private
-
-      EVENT_TYPES[TYPE] = self
     end
   end
 end

data/lib/cassandra/protocol/responses/schema_change_result_response.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,9 +19,19 @@
 module Cassandra
   module Protocol
     class SchemaChangeResultResponse < ResultResponse
-      attr_reader :change, :keyspace, :name, :type, :target, :arguments
+      # @private
+      RESULT_TYPES[0x05] = self
+
+      attr_reader :arguments, :change, :keyspace, :name, :target, :type
 
-      def initialize(custom_payload, warnings, change, keyspace, name, target, arguments, trace_id)
+      def initialize(custom_payload,
+                     warnings,
+                     change,
+                     keyspace,
+                     name,
+                     target,
+                     arguments,
+                     trace_id)
         super(custom_payload, warnings, trace_id)
 
         @change    = change
@@ -33,12 +43,12 @@ module Cassandra
 
       def eql?(other)
         @change == other.change &&
-        @keyspace == other.keyspace &&
-        @name == other.name &&
-        @target == other.target &&
-        @arguments == other.arguments
+          @keyspace == other.keyspace &&
+          @name == other.name &&
+          @target == other.target &&
+          @arguments == other.arguments
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash
         @h ||= begin
@@ -53,12 +63,8 @@ module Cassandra
       end
 
       def to_s
-        %(RESULT SCHEMA_CHANGE #@change #@target "#@keyspace" "#@name")
+        %(RESULT SCHEMA_CHANGE #{@change} #{@target} "#{@keyspace}" "#{@name}")
       end
-
-      private
-
-      RESULT_TYPES[0x05] = self
     end
   end
 end

data/lib/cassandra/protocol/responses/set_keyspace_result_response.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,6 +19,9 @@
 module Cassandra
   module Protocol
     class SetKeyspaceResultResponse < ResultResponse
+      # @private
+      RESULT_TYPES[0x03] = self
+
       attr_reader :keyspace
 
       def initialize(custom_payload, warnings, keyspace, trace_id)
@@ -27,12 +30,8 @@ module Cassandra
       end
 
       def to_s
-        %(RESULT SET_KEYSPACE "#@keyspace")
+        %(RESULT SET_KEYSPACE "#{@keyspace}")
       end
-
-      private
-
-      RESULT_TYPES[0x03] = self
     end
   end
 end

data/lib/cassandra/protocol/responses/status_change_event_response.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,6 +21,9 @@ module Cassandra
     class StatusChangeEventResponse < EventResponse
       TYPE = 'STATUS_CHANGE'.freeze
 
+      # @private
+      EVENT_TYPES[TYPE] = self
+
       attr_reader :type, :change, :address, :port
 
       def initialize(*args)
@@ -29,12 +32,8 @@ module Cassandra
       end
 
       def to_s
-        %(EVENT #@type #@change #@address:#@port)
+        %(EVENT #{@type} #{@change} #{@address}:#{@port})
       end
-
-      private
-
-      EVENT_TYPES[TYPE] = self
     end
   end
 end

data/lib/cassandra/protocol/responses/supported_response.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,6 +19,9 @@
 module Cassandra
   module Protocol
     class SupportedResponse < Response
+      # @private
+      RESPONSE_TYPES[0x06] = self
+
       attr_reader :options
 
       def initialize(options)
@@ -28,10 +31,6 @@ module Cassandra
       def to_s
         %(SUPPORTED #{options})
       end
-
-      private
-
-      RESPONSE_TYPES[0x06] = self
     end
   end
 end

data/lib/cassandra/protocol/responses/topology_change_event_response.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,14 +21,13 @@ module Cassandra
     class TopologyChangeEventResponse < StatusChangeEventResponse
       TYPE = 'TOPOLOGY_CHANGE'.freeze
 
+      # @private
+      EVENT_TYPES[TYPE] = self
+
       def initialize(*args)
         super
         @type = TYPE
       end
-
-      private
-
-      EVENT_TYPES[TYPE] = self
     end
   end
 end

data/lib/cassandra/protocol/responses/unavailable_error_response.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,13 @@ module Cassandra
     class UnavailableErrorResponse < ErrorResponse
       attr_reader :consistency, :required, :alive
 
-      def initialize(custom_payload, warnings, code, message, consistency, required, alive)
+      def initialize(custom_payload,
+                     warnings,
+                     code,
+                     message,
+                     consistency,
+                     required,
+                     alive)
         super(custom_payload, warnings, code, message)
 
         @consistency = consistency
@@ -30,7 +36,18 @@ module Cassandra
       end
 
       def to_error(keyspace, statement, options, hosts, r_consistency, retries)
-        Errors::UnavailableError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, r_consistency, retries, @consistency, @required, @alive)
+        Errors::UnavailableError.new(@message,
+                                     @custom_payload,
+                                     @warnings,
+                                     keyspace,
+                                     statement,
+                                     options,
+                                     hosts,
+                                     r_consistency,
+                                     retries,
+                                     @consistency,
+                                     @required,
+                                     @alive)
       end
 
       def to_s

data/lib/cassandra/protocol/responses/unprepared_error_response.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,7 +28,16 @@ module Cassandra
       end
 
       def to_error(keyspace, statement, options, hosts, consistency, retries)
-        Errors::UnpreparedError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @id)
+        Errors::UnpreparedError.new(@message,
+                                    @custom_payload,
+                                    @warnings,
+                                    keyspace,
+                                    statement,
+                                    options,
+                                    hosts,
+                                    consistency,
+                                    retries,
+                                    @id)
       end
 
       def to_s