javonet-ruby-sdk 2.6.10 → 2.6.11

data/lib/javonet-ruby-sdk/utils/command.rb

@@ -1,93 +1,79 @@
-require_relative 'runtime_name_javonet'
-require_relative 'runtime_name_handler'
-require_relative 'command_type'
-
-class Command
-  def initialize(runtime_name, command_type, payload)
-    @runtime_name = runtime_name
-    @command_type = command_type
-    @payload = payload
-  end
-
-  def runtime_name
-    @runtime_name
-  end
-
-  def command_type
-    @command_type
-  end
-
-  def payload
-    @payload
-  end
-
-
-  def self.create_response(response, runtime_name)
-    return Command.new(runtime_name, CommandType::VALUE, [response])
-  end
-
-  def self.create_reference(guid, runtime_name)
-    return Command.new(runtime_name, CommandType::REFERENCE, [guid])
-  end
-
-  def self.create_array_response(array, runtime_name)
-    return Command.new(runtime_name, CommandType::ARRAY, array)
-  end
-
-  def drop_first_payload_argument
-    payload_args = []
-    payload_args = payload_args + @payload
-    if payload_args.length != 0
-      payload_args.delete_at(0)
-    end
-    return Command.new(@runtime_name, @command_type, payload_args)
-  end
-
-  def add_arg_to_payload(argument)
-    merged_payload = payload + [argument]
-    return Command.new(@runtime_name, @command_type, merged_payload)
-  end
-
-  def prepend_arg_to_payload(current_command)
-    if current_command.nil?
-      return Command.new(@runtime_name, @command_type, @payload)
-    else
-      merged_payload = [current_command] + payload
-      return Command.new(@runtime_name, @command_type, merged_payload)
-    end
-  end
-
-  def to_string
-    'Runtime Library: ' + RuntimeNameHandler.get_name(@runtime_name) + ' ' + 'Ruby command type: ' + CommandType.get_name(@command_type).to_s + ' ' + 'with parameters: ' + @payload.to_s
-  end
-
-  def eql?(other)
-    @is_equal = false
-    if self == other
-      @is_equal = true
-    end
-    if other == nil or self.class != other.class
-      @is_equal = false
-    end
-    if self.command_type == other.command_type and self.runtime_name == other.runtime_name
-      @is_equal = true
-    end
-    if payload.length == other.payload.length
-      i = 0
-      array_item_equal = false
-      payload.each { |payload_item|
-        if payload_item.eql? other.payload[i]
-          array_item_equal = true
-        else
-          array_item_equal = false
-        end
-        i += 1
-      }
-      @is_equal = array_item_equal
-    else
-      @is_equal = false
-    end
-    return @is_equal
-  end
-
-end
+# ruby
+require_relative 'runtime_name_javonet'
+require_relative 'runtime_name_handler'
+require_relative 'command_type'
+
+class Command
+  attr_reader :runtime_name, :command_type, :payload
+
+  def initialize(runtime_name, command_type, *payload)
+    @runtime_name = runtime_name
+    @command_type = command_type
+
+    if payload.empty?
+      @payload = []
+    elsif payload.size == 1 && payload[0].is_a?(Array)
+      # caller passed a single array -> reuse it (no extra copy)
+      @payload = payload[0] || []
+    else
+      # varargs or multiple args -> use as provided
+      @payload = payload
+    end
+  end
+
+  def self.create_response(response, runtime_name)
+    Command.new(runtime_name, CommandType::VALUE, response)
+  end
+
+  def self.create_reference(guid, runtime_name)
+    Command.new(runtime_name, CommandType::REFERENCE, guid)
+  end
+
+  def self.create_array_response(array, runtime_name)
+    Command.new(runtime_name, CommandType::ARRAY, array)
+  end
+
+  def drop_first_payload_argument
+    return Command.new(@runtime_name, @command_type, []) if @payload.length <= 1
+
+    new_payload = @payload[1..-1] || []
+    Command.new(@runtime_name, @command_type, new_payload)
+  end
+
+  def add_arg_to_payload(argument)
+    new_payload = @payload + [argument]
+    Command.new(@runtime_name, @command_type, new_payload)
+  end
+
+  def prepend_arg_to_payload(arg_command)
+    return self if arg_command.nil?
+
+    new_payload = [arg_command] + @payload
+    Command.new(@runtime_name, @command_type, new_payload)
+  end
+
+  def to_string
+    'Runtime Library: ' + RuntimeNameHandler.get_name(@runtime_name) +
+      ' ' + 'Ruby command type: ' + CommandType.get_name(@command_type).to_s +
+      ' ' + 'with parameters: ' + @payload.to_s
+  end
+
+  def to_s
+    to_string
+  end
+
+  def eql?(other)
+    return true if equal?(other)
+    return false unless other.is_a?(Command)
+    return false unless runtime_name == other.runtime_name && command_type == other.command_type
+    return false unless payload.length == other.payload.length
+
+    payload.each_with_index do |item, i|
+      return false unless item.eql?(other.payload[i])
+    end
+
+    true
+  end
+
+  alias == eql?
+end

data/lib/javonet-ruby-sdk/utils/command_type.rb

@@ -1,154 +1,154 @@
-class CommandType
-  VALUE = 0
-  LOAD_LIBRARY = 1
-  INVOKE_STATIC_METHOD = 2
-  GET_STATIC_FIELD = 3
-  SET_STATIC_FIELD = 4
-  CREATE_CLASS_INSTANCE = 5
-  GET_TYPE = 6
-  REFERENCE = 7
-  GET_MODULE = 8
-  INVOKE_INSTANCE_METHOD = 9
-  EXCEPTION = 10
-  HEARTBEAT = 11
-  CAST = 12
-  GET_INSTANCE_FIELD = 13
-  OPTIMIZE = 14
-  GENERATE_LIB = 15
-  INVOKE_GLOBAL_FUNCTION = 16
-  DESTRUCT_REFERENCE = 17
-  ARRAY_REFERENCE = 18
-  ARRAY_GET_ITEM = 19
-  ARRAY_GET_SIZE = 20
-  ARRAY_GET_RANK = 21
-  ARRAY_SET_ITEM = 22
-  ARRAY = 23
-  RETRIEVE_ARRAY = 24
-  SET_INSTANCE_FIELD = 25
-  INVOKE_GENERIC_STATIC_METHOD = 26
-  INVOKE_GENERIC_METHOD = 27
-  GET_ENUM_ITEM = 28
-  GET_ENUM_NAME = 29
-  GET_ENUM_VALUE = 30
-  AS_REF = 31
-  AS_OUT = 32
-  GET_REF_VALUE = 33
-  ENABLE_NAMESPACE = 34
-  ENABLE_TYPE = 35
-  CREATE_NULL = 36
-  GET_STATIC_METHOD_AS_DELEGATE = 37
-  GET_INSTANCE_METHOD_AS_DELEGATE = 38
-  PASS_DELEGATE = 39
-  INVOKE_DELEGATE = 40
-  CONVERT_TYPE = 41
-  ADD_EVENT_LISTENER = 42
-  PLUGIN_WRAPPER = 43
-  GET_ASYNC_OPERATION_RESULT = 44
-  AS_KWARGS = 45
-  GET_RESULT_TYPE = 46
-  GET_GLOBAL_FIELD = 47
-  REGISTER_FOR_UPDATE = 48
-  VALUE_FOR_UPDATE = 49
-
-
-  def self.get_name(command_number)
-    case command_number
-    when 0
-      return 'VALUE'
-    when 1
-      return 'LOAD_LIBRARY'
-    when 2
-      return 'INVOKE_STATIC_METHOD'
-    when 3
-      return 'GET_STATIC_FIELD'
-    when 4
-      return 'SET_STATIC_FIELD'
-    when 5
-      return 'CREATE_CLASS_INSTANCE'
-    when 6
-      return 'GET_TYPE'
-    when 7
-      return 'REFERENCE'
-    when 8
-      return 'GET_MODULE'
-    when 9
-      return 'INVOKE_INSTANCE_METHOD'
-    when 10
-      return 'EXCEPTION'
-    when 11
-      return 'HEARTBEAT'
-    when 12
-      return 'CAST'
-    when 13
-      return 'GET_INSTANCE_FIELD'
-    when 14
-      return 'OPTIMIZE'
-    when 15
-      return 'GENERATE_LIB'
-    when 16
-      return 'INVOKE_GLOBAL_FUNCTION'
-    when 17
-      return 'DESTRUCT_REFERENCE'
-    when 18
-      return 'ARRAY_REFERENCE'
-    when 19
-      return 'ARRAY_GET_ITEM'
-    when 20
-      return 'ARRAY_GET_SIZE'
-    when 21
-      return 'ARRAY_GET_RANK'
-    when 22
-      return 'ARRAY_SET_ITEM'
-    when 23
-      return 'ARRAY'
-    when 24
-      return 'RETRIEVE_ARRAY'
-    when 25
-      return 'SET_INSTANCE_FIELD'
-    when 26
-      return 'INVOKE_GENERIC_STATIC_METHOD'
-    when 27
-      return 'INVOKE_GENERIC_METHOD'
-    when 28
-      return 'GET_ENUM_ITEM'
-    when 29
-      return 'GET_ENUM_NAME'
-    when 30
-      return 'GET_ENUM_VALUE'
-    when 31
-      return 'AS_REF'
-    when 32
-      return 'AS_OUT'
-    when 33
-      return 'GET_REF_VALUE'
-    when 34
-      return 'ENABLE_NAMESPACE'
-    when 35
-      return 'ENABLE_TYPE'
-    when 36
-      return 'CREATE_NULL'
-    when 37
-      return 'GET_STATIC_METHOD_AS_DELEGATE'
-    when 38
-      return 'GET_INSTANCE_METHOD_AS_DELEGATE'
-    when 39
-      return 'PASS_DELEGATE'
-    when 40
-      return 'INVOKE_DELEGATE'
-    when 41
-      return 'CONVERT_TYPE'
-    when 42
-      return 'ADD_EVENT_LISTENER'
-    when 43
-      return 'PLUGIN_WRAPPER'
-    when 44
-      return 'GET_ASYNC_OPERATION_RESULT'
-    when 48
-      return 'REGISTER_FOR_UPDATE'
-    when 49
-      return 'VALUE_FOR_UPDATE'
-    else
-      raise 'Unknown command type'
-    end
-  end
-end
+class CommandType
+  VALUE = 0
+  LOAD_LIBRARY = 1
+  INVOKE_STATIC_METHOD = 2
+  GET_STATIC_FIELD = 3
+  SET_STATIC_FIELD = 4
+  CREATE_CLASS_INSTANCE = 5
+  GET_TYPE = 6
+  REFERENCE = 7
+  GET_MODULE = 8
+  INVOKE_INSTANCE_METHOD = 9
+  EXCEPTION = 10
+  HEARTBEAT = 11
+  CAST = 12
+  GET_INSTANCE_FIELD = 13
+  OPTIMIZE = 14
+  GENERATE_LIB = 15
+  INVOKE_GLOBAL_FUNCTION = 16
+  DESTRUCT_REFERENCE = 17
+  ARRAY_REFERENCE = 18
+  ARRAY_GET_ITEM = 19
+  ARRAY_GET_SIZE = 20
+  ARRAY_GET_RANK = 21
+  ARRAY_SET_ITEM = 22
+  ARRAY = 23
+  RETRIEVE_ARRAY = 24
+  SET_INSTANCE_FIELD = 25
+  INVOKE_GENERIC_STATIC_METHOD = 26
+  INVOKE_GENERIC_METHOD = 27
+  GET_ENUM_ITEM = 28
+  GET_ENUM_NAME = 29
+  GET_ENUM_VALUE = 30
+  AS_REF = 31
+  AS_OUT = 32
+  GET_REF_VALUE = 33
+  ENABLE_NAMESPACE = 34
+  ENABLE_TYPE = 35
+  CREATE_NULL = 36
+  GET_STATIC_METHOD_AS_DELEGATE = 37
+  GET_INSTANCE_METHOD_AS_DELEGATE = 38
+  PASS_DELEGATE = 39
+  INVOKE_DELEGATE = 40
+  CONVERT_TYPE = 41
+  ADD_EVENT_LISTENER = 42
+  PLUGIN_WRAPPER = 43
+  GET_ASYNC_OPERATION_RESULT = 44
+  AS_KWARGS = 45
+  GET_RESULT_TYPE = 46
+  GET_GLOBAL_FIELD = 47
+  REGISTER_FOR_UPDATE = 48
+  VALUE_FOR_UPDATE = 49
+
+
+  def self.get_name(command_number)
+    case command_number
+    when 0
+      return 'VALUE'
+    when 1
+      return 'LOAD_LIBRARY'
+    when 2
+      return 'INVOKE_STATIC_METHOD'
+    when 3
+      return 'GET_STATIC_FIELD'
+    when 4
+      return 'SET_STATIC_FIELD'
+    when 5
+      return 'CREATE_CLASS_INSTANCE'
+    when 6
+      return 'GET_TYPE'
+    when 7
+      return 'REFERENCE'
+    when 8
+      return 'GET_MODULE'
+    when 9
+      return 'INVOKE_INSTANCE_METHOD'
+    when 10
+      return 'EXCEPTION'
+    when 11
+      return 'HEARTBEAT'
+    when 12
+      return 'CAST'
+    when 13
+      return 'GET_INSTANCE_FIELD'
+    when 14
+      return 'OPTIMIZE'
+    when 15
+      return 'GENERATE_LIB'
+    when 16
+      return 'INVOKE_GLOBAL_FUNCTION'
+    when 17
+      return 'DESTRUCT_REFERENCE'
+    when 18
+      return 'ARRAY_REFERENCE'
+    when 19
+      return 'ARRAY_GET_ITEM'
+    when 20
+      return 'ARRAY_GET_SIZE'
+    when 21
+      return 'ARRAY_GET_RANK'
+    when 22
+      return 'ARRAY_SET_ITEM'
+    when 23
+      return 'ARRAY'
+    when 24
+      return 'RETRIEVE_ARRAY'
+    when 25
+      return 'SET_INSTANCE_FIELD'
+    when 26
+      return 'INVOKE_GENERIC_STATIC_METHOD'
+    when 27
+      return 'INVOKE_GENERIC_METHOD'
+    when 28
+      return 'GET_ENUM_ITEM'
+    when 29
+      return 'GET_ENUM_NAME'
+    when 30
+      return 'GET_ENUM_VALUE'
+    when 31
+      return 'AS_REF'
+    when 32
+      return 'AS_OUT'
+    when 33
+      return 'GET_REF_VALUE'
+    when 34
+      return 'ENABLE_NAMESPACE'
+    when 35
+      return 'ENABLE_TYPE'
+    when 36
+      return 'CREATE_NULL'
+    when 37
+      return 'GET_STATIC_METHOD_AS_DELEGATE'
+    when 38
+      return 'GET_INSTANCE_METHOD_AS_DELEGATE'
+    when 39
+      return 'PASS_DELEGATE'
+    when 40
+      return 'INVOKE_DELEGATE'
+    when 41
+      return 'CONVERT_TYPE'
+    when 42
+      return 'ADD_EVENT_LISTENER'
+    when 43
+      return 'PLUGIN_WRAPPER'
+    when 44
+      return 'GET_ASYNC_OPERATION_RESULT'
+    when 48
+      return 'REGISTER_FOR_UPDATE'
+    when 49
+      return 'VALUE_FOR_UPDATE'
+    else
+      raise 'Unknown command type'
+    end
+  end
+end

data/lib/javonet-ruby-sdk/utils/connection_type.rb

@@ -1,5 +1,5 @@
-class ConnectionType
-  IN_MEMORY = 0
-  TCP = 1
-  WEB_SOCKET = 2
-end
+class ConnectionType
+  IN_MEMORY = 0
+  TCP = 1
+  WEB_SOCKET = 2
+end