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

data/lib/cassandra/protocol/responses/already_exists_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.
@@ -29,7 +29,17 @@ module Cassandra
       end
 
       def to_error(keyspace, statement, options, hosts, consistency, retries)
-        Errors::AlreadyExistsError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @keyspace, @table)
+        Errors::AlreadyExistsError.new(@message,
+                                       @custom_payload,
+                                       @warnings,
+                                       keyspace,
+                                       statement,
+                                       options,
+                                       hosts,
+                                       consistency,
+                                       retries,
+                                       @keyspace,
+                                       @table)
       end
 
       def to_s

data/lib/cassandra/protocol/responses/auth_challenge_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 AuthChallengeResponse < Response
+      # @private
+      RESPONSE_TYPES[0x0e] = self
+
       attr_reader :token
 
       def initialize(token)
@@ -28,10 +31,6 @@ module Cassandra
       def to_s
         %(AUTH_CHALLENGE #{@token.bytesize})
       end
-
-      private
-
-      RESPONSE_TYPES[0x0e] = self
     end
   end
 end

data/lib/cassandra/protocol/responses/auth_success_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 AuthSuccessResponse < Response
+      # @private
+      RESPONSE_TYPES[0x10] = self
+
       attr_reader :token
 
       def initialize(token)
@@ -28,10 +31,6 @@ module Cassandra
       def to_s
         %(AUTH_SUCCESS #{@token && @token.bytesize})
       end
-
-      private
-
-      RESPONSE_TYPES[0x10] = self
     end
   end
 end

data/lib/cassandra/protocol/responses/authenticate_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 AuthenticateResponse < Response
+      # @private
+      RESPONSE_TYPES[0x03] = self
+
       attr_reader :authentication_class
 
       def initialize(authentication_class)
@@ -28,10 +31,6 @@ module Cassandra
       def to_s
         %(AUTHENTICATE #{authentication_class})
       end
-
-      private
-
-      RESPONSE_TYPES[0x03] = self
     end
   end
 end

data/lib/cassandra/protocol/responses/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.
@@ -19,6 +19,9 @@
 module Cassandra
   module Protocol
     class ErrorResponse < Response
+      # @private
+      RESPONSE_TYPES[0x00] = self
+
       attr_reader :code, :message, :custom_payload, :warnings
 
       def initialize(*args)
@@ -27,29 +30,113 @@ module Cassandra
 
       def to_s
         hex_code = @code.to_s(16).rjust(4, '0').upcase
-        %(ERROR 0x#{hex_code} "#@message")
+        %(ERROR 0x#{hex_code} "#{@message}")
       end
 
       def to_error(keyspace, statement, options, hosts, consistency, retries)
         case @code
-        when 0x0000 then Errors::ServerError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x000A then Errors::ProtocolError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x0100 then Errors::AuthenticationError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x1001 then Errors::OverloadedError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x1002 then Errors::IsBootstrappingError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x1003 then Errors::TruncateError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x2000 then Errors::SyntaxError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x2100 then Errors::UnauthorizedError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x2200 then Errors::InvalidError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
-        when 0x2300 then Errors::ConfigurationError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
+        when 0x0000 then Errors::ServerError.new(@message,
+                                                 @custom_payload,
+                                                 @warnings,
+                                                 keyspace,
+                                                 statement,
+                                                 options,
+                                                 hosts,
+                                                 consistency,
+                                                 retries)
+        when 0x000A then Errors::ProtocolError.new(@message,
+                                                   @custom_payload,
+                                                   @warnings,
+                                                   keyspace,
+                                                   statement,
+                                                   options,
+                                                   hosts,
+                                                   consistency,
+                                                   retries)
+        when 0x0100 then Errors::AuthenticationError.new(@message,
+                                                         @custom_payload,
+                                                         @warnings,
+                                                         keyspace,
+                                                         statement,
+                                                         options,
+                                                         hosts,
+                                                         consistency,
+                                                         retries)
+        when 0x1001 then Errors::OverloadedError.new(@message,
+                                                     @custom_payload,
+                                                     @warnings,
+                                                     keyspace,
+                                                     statement,
+                                                     options,
+                                                     hosts,
+                                                     consistency,
+                                                     retries)
+        when 0x1002 then Errors::IsBootstrappingError.new(@message,
+                                                          @custom_payload,
+                                                          @warnings,
+                                                          keyspace,
+                                                          statement,
+                                                          options,
+                                                          hosts,
+                                                          consistency,
+                                                          retries)
+        when 0x1003 then Errors::TruncateError.new(@message,
+                                                   @custom_payload,
+                                                   @warnings,
+                                                   keyspace,
+                                                   statement,
+                                                   options,
+                                                   hosts,
+                                                   consistency,
+                                                   retries)
+        when 0x2000 then Errors::SyntaxError.new(@message,
+                                                 @custom_payload,
+                                                 @warnings,
+                                                 keyspace,
+                                                 statement,
+                                                 options,
+                                                 hosts,
+                                                 consistency,
+                                                 retries)
+        when 0x2100 then Errors::UnauthorizedError.new(@message,
+                                                       @custom_payload,
+                                                       @warnings,
+                                                       keyspace,
+                                                       statement,
+                                                       options,
+                                                       hosts,
+                                                       consistency,
+                                                       retries)
+        when 0x2200 then Errors::InvalidError.new(@message,
+                                                  @custom_payload,
+                                                  @warnings,
+                                                  keyspace,
+                                                  statement,
+                                                  options,
+                                                  hosts,
+                                                  consistency,
+                                                  retries)
+        when 0x2300 then Errors::ConfigurationError.new(@message,
+                                                        @custom_payload,
+                                                        @warnings,
+                                                        keyspace,
+                                                        statement,
+                                                        options,
+                                                        hosts,
+                                                        consistency,
+                                                        retries)
         else
-          Errors::ServerError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries)
+          Errors::ServerError.new(@message,
+                                  @custom_payload,
+                                  @warnings,
+                                  keyspace,
+                                  statement,
+                                  options,
+                                  hosts,
+                                  consistency,
+                                  retries)
         end
       end
-
-      private
-
-      RESPONSE_TYPES[0x00] = self
     end
   end
 end

data/lib/cassandra/protocol/responses/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.
@@ -19,10 +19,9 @@
 module Cassandra
   module Protocol
     class EventResponse < ResultResponse
-      private
-
+      # @private
       RESPONSE_TYPES[0x0c] = self
-
+      # @private
       EVENT_TYPES = {
         # populated by subclasses
       }

data/lib/cassandra/protocol/responses/function_failure_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.
@@ -30,7 +30,18 @@ module Cassandra
       end
 
       def to_error(keyspace, statement, options, hosts, consistency, retries)
-        Errors::FunctionCallError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @keyspace, @name, @signature)
+        Errors::FunctionCallError.new(@message,
+                                      @custom_payload,
+                                      @warnings,
+                                      keyspace,
+                                      statement,
+                                      options,
+                                      hosts,
+                                      consistency,
+                                      retries,
+                                      @keyspace,
+                                      @name,
+                                      @signature)
       end
 
       def to_s

data/lib/cassandra/protocol/responses/prepared_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,18 @@
 module Cassandra
   module Protocol
     class PreparedResultResponse < ResultResponse
+      # @private
+      RESULT_TYPES[0x04] = self
+
       attr_reader :id, :metadata, :result_metadata, :pk_idx
 
-      def initialize(custom_payload, warnings, id, metadata, result_metadata, pk_idx, trace_id)
+      def initialize(custom_payload,
+                     warnings,
+                     id,
+                     metadata,
+                     result_metadata,
+                     pk_idx,
+                     trace_id)
         super(custom_payload, warnings, trace_id)
         @id              = id
         @metadata        = metadata
@@ -30,9 +39,9 @@ module Cassandra
       end
 
       def eql?(other)
-        self.id == other.id && self.metadata == other.metadata && self.trace_id == other.trace_id
+        id == other.id && metadata == other.metadata && trace_id == other.trace_id
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash
         @h ||= begin
@@ -46,12 +55,8 @@ module Cassandra
 
       def to_s
         hex_id = @id.each_byte.map { |x| x.to_s(16).rjust(2, '0') }.join('')
-        %(RESULT PREPARED #{hex_id} #@metadata)
+        %(RESULT PREPARED #{hex_id} #{@metadata})
       end
-
-      private
-
-      RESULT_TYPES[0x04] = self
     end
   end
 end

data/lib/cassandra/protocol/responses/raw_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,7 +19,12 @@
 module Cassandra
   module Protocol
     class RawRowsResultResponse < RowsResultResponse
-      def initialize(custom_payload, warnings, protocol_version, raw_rows, paging_state, trace_id)
+      def initialize(custom_payload,
+                     warnings,
+                     protocol_version,
+                     raw_rows,
+                     paging_state,
+                     trace_id)
         super(custom_payload, warnings, nil, nil, paging_state, trace_id)
         @protocol_version = protocol_version
         @raw_rows = raw_rows
@@ -28,13 +33,13 @@ module Cassandra
       def materialize(metadata)
         @metadata = metadata
 
-        if @protocol_version == 4
-          @rows = Coder.read_values_v4(@raw_rows, @metadata)
-        elsif @protocol_version == 3
-          @rows = Coder.read_values_v3(@raw_rows, @metadata)
-        else
-          @rows = Coder.read_values_v1(@raw_rows, @metadata)
-        end
+        @rows = if @protocol_version == 4
+                  Coder.read_values_v4(@raw_rows, @metadata)
+                elsif @protocol_version == 3
+                  Coder.read_values_v3(@raw_rows, @metadata)
+                else
+                  Coder.read_values_v1(@raw_rows, @metadata)
+                end
 
         @rows
       end

data/lib/cassandra/protocol/responses/read_failure_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,15 @@ module Cassandra
     class ReadFailureErrorResponse < ErrorResponse
       attr_reader :consistency, :received, :blockfor, :numfailures, :data_present
 
-      def initialize(custom_payload, warnings, code, message, consistency, received, blockfor, numfailures, data_present)
+      def initialize(custom_payload,
+                     warnings,
+                     code,
+                     message,
+                     consistency,
+                     received,
+                     blockfor,
+                     numfailures,
+                     data_present)
         super(custom_payload, warnings, code, message)
 
         @consistency  = consistency
@@ -32,11 +40,25 @@ module Cassandra
       end
 
       def to_error(keyspace, statement, options, hosts, consistency, retries)
-        Errors::ReadError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @data_present, @consistency, @blockfor, @numfailures, @received)
+        Errors::ReadError.new(@message,
+                              @custom_payload,
+                              @warnings,
+                              keyspace,
+                              statement,
+                              options,
+                              hosts,
+                              consistency,
+                              retries,
+                              @data_present,
+                              @consistency,
+                              @blockfor,
+                              @numfailures,
+                              @received)
       end
 
       def to_s
-        "#{super} #{@consistency} #{@received} #{@blockfor} #{@numfailures} #{@data_present}"
+        "#{super} #{@consistency} #{@received} #{@blockfor} #{@numfailures} " \
+            "#{@data_present}"
       end
     end
   end