javonet-ruby-sdk 2.1.5 → 2.1.7

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/handler/command_handler/invoke_static_method_handler.rb

@@ -12,7 +12,7 @@ class InvokeStaticMethodHandler < AbstractCommandHandler
   def invoke_static_method(command)
     begin
       if command.payload.length < @required_parameters_count
-        raise "Static method parameters mismatch"
+        raise ArgumentError.new "Static method parameters mismatch"
       end
       if command.payload.length > @required_parameters_count
         args = command.payload[2..]

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/handler/command_handler/load_library_handler.rb

@@ -8,7 +8,7 @@ class LoadLibraryHandler < AbstractCommandHandler
   def process(command)
     begin
       if command.payload.length < @required_parameters_count
-        raise Exception.new "Load library method parameters mismatch"
+        raise ArgumentError.new "Load library parameters mismatch"
       end
       if command.payload.length > @required_parameters_count
         assembly_name = command.payload[1]

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/handler/command_handler/resolve_instance_handler.rb

@@ -12,7 +12,7 @@ class ResolveInstanceHandler < AbstractCommandHandler
 
   def resolve_reference(command)
     if command.payload.length != @required_parameters_count
-      raise "Resolve Instance parameters mismatch"
+      raise ArgumentError.new "Resolve Instance parameters mismatch"
     end
     begin
       references_cache = ReferencesCache.instance

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/handler/command_handler/set_instance_field_handler.rb

@@ -0,0 +1,27 @@
+require_relative 'abstract_command_handler'
+
+class SetInstanceFieldHandler < AbstractCommandHandler
+  def initialize
+    @required_parameters_count = 3
+  end
+
+  def process(command)
+    return set_instance_field(command)
+  end
+
+  def set_instance_field(command)
+    begin
+      if command.payload.length < @required_parameters_count
+        raise ArgumentError.new "Set Instance Field parameters mismatch"
+      end
+      merged_value = '@' + command.payload[1]
+      if command.payload[0].instance_variable_defined?(merged_value)
+        command.payload[0].instance_variable_set(merged_value, command.payload[2])
+      else
+        raise "Instance field not defined"
+      end
+    rescue Exception => e
+      return e
+    end
+  end
+end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/handler/command_handler/set_static_field_handler.rb

@@ -12,7 +12,7 @@ class SetStaticFieldHandler < AbstractCommandHandler
   def set_static_field(command)
     begin
       if command.payload.length != @required_parameters_count
-        raise "Set static field parameters mismatch"
+        raise ArgumentError.new "Set static field parameters mismatch"
       end
 
       merged_value = '@@' + command.payload[1]

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/core/handler/handler.rb

@@ -6,6 +6,7 @@ require_relative '../../core/handler/command_handler/load_library_handler'
 require_relative '../../core/handler/command_handler/invoke_static_method_handler'
 require_relative '../../core/handler/command_handler/get_static_field_handler'
 require_relative '../../core/handler/command_handler/get_instance_field_handler'
+require_relative '../../core/handler/command_handler/set_instance_field_handler'
 require_relative '../../core/handler/command_handler/create_class_instance_handler'
 require_relative '../../core/handler/command_handler/set_static_field_handler'
 require_relative '../../core/handler/command_handler/get_type_handler'
@@ -38,6 +39,7 @@ class Handler < AbstractHandler
     resolve_instance_handler = ResolveInstanceHandler.new
     casting_handler = CastingHandler.new
     get_instance_field_handler = GetInstanceFieldHandler.new
+    set_instance_field_handler = SetInstanceFieldHandler.new
     destruct_reference_handler = DestructReferenceHandler.new
     array_get_item_handler = ArrayGetItemHandler.new
     array_get_size_handler = ArrayGetSizeHandler.new
@@ -57,13 +59,13 @@ class Handler < AbstractHandler
     $handler_dict[CommandType::REFERENCE] = resolve_instance_handler
     $handler_dict[CommandType::CAST] = casting_handler
     $handler_dict[CommandType::GET_INSTANCE_FIELD] = get_instance_field_handler
+    $handler_dict[CommandType::SET_INSTANCE_FIELD] = set_instance_field_handler
     $handler_dict[CommandType::DESTRUCT_REFERENCE] = destruct_reference_handler
     $handler_dict[CommandType::ARRAY_GET_ITEM] = array_get_item_handler
     $handler_dict[CommandType::ARRAY_GET_SIZE] = array_get_size_handler
     $handler_dict[CommandType::ARRAY_GET_RANK] = array_get_rank_handler
     $handler_dict[CommandType::ARRAY_SET_ITEM] = array_set_item_handler
     $handler_dict[CommandType::ARRAY] = array_handler
-
   end
 
 

data/lib/javonet-ruby-sdk/Binaries/Ruby/Windows/X64/utils/command_type.rb

@@ -24,6 +24,7 @@ class CommandType
   ARRAY_SET_ITEM = 22
   ARRAY = 23
   RETRIEVE_ARRAY = 24
+  SET_INSTANCE_FIELD = 25
 
   def self.get_name(command_number)
     case command_number
@@ -77,6 +78,8 @@ class CommandType
       return 'ARRAY'
     when 24
       return 'RETRIEVE_ARRAY'
+    when 25
+      return 'SET_INSTANCE_FIELD'
     end
   end
 end

data/lib/javonet-ruby-sdk/core/exceptions/exception_thrower.rb

@@ -5,15 +5,14 @@ class ExceptionThrower
   def self.throw_exception(exception_command)
     exception_code = exception_command.payload[0]
     javonet_stack_command = exception_command.payload[1]
-    exception_name =  exception_command.payload[2]
+    exception_name = exception_command.payload[2]
     exception_message = exception_command.payload[3]
 
     exception_object = get_exception_object(exception_code, exception_message)
 
     stack_trace = get_local_stack_trace(exception_command.payload[4], exception_command.payload[5], exception_command.payload[6], exception_command.payload[7])
     exception_object.set_backtrace(stack_trace)
-    raise exception_object
-
+    return exception_object
   end
 
   def self.get_local_stack_trace(stack_trace_classes, stack_trace_methods, stack_trace_lines, stack_trace_files)
@@ -22,10 +21,22 @@ class ExceptionThrower
     stack_lines_array = stack_trace_lines.split("|")
     stack_files_array = stack_trace_files.split("|")
 
-    stack_trace = []
-    stack_classes_array.each_with_index do |class_name, index|
-      stack_trace << "#{stack_files_array[index]}:#{stack_lines_array[index]}:in `#{class_name}##{stack_methods_array[index]}'"
+    stack_trace = ""
+    stack_classes_array.each_with_index do |class_name, i|
+      if (i < stack_files_array.length and stack_files_array[i] != "")
+        stack_trace += "#{stack_files_array[i]}:"
+      end
+      if (i < stack_lines_array.length and stack_lines_array[i] != "")
+        stack_trace += "#{stack_lines_array[i]} "
+      end
+      if (class_name != "")
+        stack_trace += "in '#{class_name}#"
+      end
+      if (i < stack_methods_array.length and stack_methods_array[i] != "")
+        stack_trace += "#{stack_methods_array[i]}'\n"
+      end
     end
+
     return stack_trace
   end
 
@@ -48,7 +59,7 @@ class ExceptionThrower
     when ExceptionType::NULL_POINTER_EXCEPTION
       return TypeError.new("TypeError " + exception_message)
     else
-      return Exception.new(exception_code.to_s + " " +exception_message)
+      return Exception.new(exception_code.to_s + " " + exception_message)
     end
   end
 end

data/lib/javonet-ruby-sdk/core/handler/command_handler/array_get_item_handler.rb

@@ -1,8 +1,15 @@
 require_relative 'abstract_command_handler'
 
 class ArrayGetItemHandler < AbstractCommandHandler
+  def initialize
+    @required_parameters_count = 2
+  end
+
   def process(command)
     begin
+      if command.payload.length < @required_parameters_count
+        raise ArgumentError.new "Array get item parameters mismatch"
+      end
       array = command.payload[0]
       index = command.payload[1,]
       return array[index]

data/lib/javonet-ruby-sdk/core/handler/command_handler/array_get_rank_handler.rb

@@ -3,7 +3,7 @@ require_relative 'abstract_command_handler'
 class ArrayGetRankHandler < AbstractCommandHandler
   def process(command)
     begin
-      raise "ArrayGetRankHandler not implemented"
+      raise ArgumentError.new "ArrayGetRankHandler not implemented"
     rescue Exception => e
       return e
     end

data/lib/javonet-ruby-sdk/core/handler/command_handler/array_get_size_handler.rb

@@ -1,8 +1,14 @@
 require_relative 'abstract_command_handler'
 
 class ArrayGetSizeHandler < AbstractCommandHandler
+  def initialize
+    @required_parameters_count = 1
+  end
   def process(command)
     begin
+      if command.payload.length < @required_parameters_count
+        raise ArgumentError.new "Array get size parameters mismatch"
+      end
       array = command.payload[0]
       return array.length()
     rescue Exception => e

data/lib/javonet-ruby-sdk/core/handler/command_handler/array_set_item_handler.rb

@@ -1,8 +1,14 @@
 require_relative 'abstract_command_handler'
 
 class ArraySetItemHandler < AbstractCommandHandler
+  def initialize
+    @required_parameters_count = 3
+  end
   def process(command)
     begin
+      if command.payload.length < @required_parameters_count
+        raise ArgumentError.new "Array set item parameters mismatch"
+      end
       array = command.payload[0]
       value = command.payload[1]
       index = command.payload[2,]

data/lib/javonet-ruby-sdk/core/handler/command_handler/create_class_instance_handler.rb

@@ -12,7 +12,7 @@ class CreateClassInstanceHandler < AbstractCommandHandler
   def create_class_instance(command)
     begin
       if command.payload.length < @required_parameters_count
-        raise "Class instance parameters mismatch"
+        raise ArgumentError.new "Class instance parameters mismatch"
       end
       if command.payload.length > 1
         constructor_arguments = command.payload[1..]

data/lib/javonet-ruby-sdk/core/handler/command_handler/destruct_reference_handler.rb

@@ -12,7 +12,7 @@ class DestructReferenceHandler < AbstractCommandHandler
         reference_cache = ReferencesCache.instance
         return reference_cache.delete_reference(command.payload[0])
       else
-        raise "Destruct Reference Handler parameters mismatch"
+        raise ArgumentError.new "Destruct Reference Handler parameters mismatch"
       end
     rescue Exception => e
       return e

data/lib/javonet-ruby-sdk/core/handler/command_handler/get_instance_field_handler.rb

@@ -12,7 +12,7 @@ class GetInstanceFieldHandler < AbstractCommandHandler
   def get_instance_field(command)
     begin
       if command.payload.length != @required_parameters_count
-        raise "Instance field parameters mismatch"
+        raise ArgumentError.new "Instance field parameters mismatch"
       end
       merged_value = '@' + command.payload[1]
       if command.payload[0].instance_variable_defined?(merged_value)

data/lib/javonet-ruby-sdk/core/handler/command_handler/get_static_field_handler.rb

@@ -12,7 +12,7 @@ class GetStaticFieldHandler < AbstractCommandHandler
   def get_static_field(command)
     begin
       if command.payload.length != @required_parameters_count
-        raise "Static field parameters mismatch"
+        raise ArgumentError.new "Static field parameters mismatch"
       end
 
       merged_value = '@@' + command.payload[1]

data/lib/javonet-ruby-sdk/core/handler/command_handler/get_type_handler.rb

@@ -8,7 +8,7 @@ class GetTypeHandler < AbstractCommandHandler
   def process(command)
     begin
       if command.payload.length < @required_parameters_count
-        raise "Get Type parameters mismatch"
+        raise ArgumentError.new "Get Type parameters mismatch"
       end
       if command.payload.length > @required_parameters_count
         return Object::const_get(command.payload[1])

data/lib/javonet-ruby-sdk/core/handler/command_handler/invoke_instance_method_handler.rb

@@ -12,7 +12,7 @@ class InvokeInstanceMethodHandler < AbstractCommandHandler
   def invoke_instance_method(command)
     begin
       if command.payload.length < @required_parameters_count
-        raise "InvokeInstanceMethod parameters mismatch"
+        raise ArgumentError.new "InvokeInstanceMethod parameters mismatch"
       end
       if command.payload.length > 2
         arguments = command.payload[2..]

data/lib/javonet-ruby-sdk/core/handler/command_handler/invoke_static_method_handler.rb

@@ -12,7 +12,7 @@ class InvokeStaticMethodHandler < AbstractCommandHandler
   def invoke_static_method(command)
     begin
       if command.payload.length < @required_parameters_count
-        raise "Static method parameters mismatch"
+        raise ArgumentError.new "Static method parameters mismatch"
       end
       if command.payload.length > @required_parameters_count
         args = command.payload[2..]

data/lib/javonet-ruby-sdk/core/handler/command_handler/load_library_handler.rb

@@ -8,7 +8,7 @@ class LoadLibraryHandler < AbstractCommandHandler
   def process(command)
     begin
       if command.payload.length < @required_parameters_count
-        raise Exception.new "Load library method parameters mismatch"
+        raise ArgumentError.new "Load library parameters mismatch"
       end
       if command.payload.length > @required_parameters_count
         assembly_name = command.payload[1]

data/lib/javonet-ruby-sdk/core/handler/command_handler/resolve_instance_handler.rb

@@ -12,7 +12,7 @@ class ResolveInstanceHandler < AbstractCommandHandler
 
   def resolve_reference(command)
     if command.payload.length != @required_parameters_count
-      raise "Resolve Instance parameters mismatch"
+      raise ArgumentError.new "Resolve Instance parameters mismatch"
     end
     begin
       references_cache = ReferencesCache.instance

data/lib/javonet-ruby-sdk/core/handler/command_handler/set_instance_field_handler.rb

@@ -0,0 +1,27 @@
+require_relative 'abstract_command_handler'
+
+class SetInstanceFieldHandler < AbstractCommandHandler
+  def initialize
+    @required_parameters_count = 3
+  end
+
+  def process(command)
+    return set_instance_field(command)
+  end
+
+  def set_instance_field(command)
+    begin
+      if command.payload.length < @required_parameters_count
+        raise ArgumentError.new "Set Instance Field parameters mismatch"
+      end
+      merged_value = '@' + command.payload[1]
+      if command.payload[0].instance_variable_defined?(merged_value)
+        command.payload[0].instance_variable_set(merged_value, command.payload[2])
+      else
+        raise "Instance field not defined"
+      end
+    rescue Exception => e
+      return e
+    end
+  end
+end

data/lib/javonet-ruby-sdk/core/handler/command_handler/set_static_field_handler.rb

@@ -12,7 +12,7 @@ class SetStaticFieldHandler < AbstractCommandHandler
   def set_static_field(command)
     begin
       if command.payload.length != @required_parameters_count
-        raise "Set static field parameters mismatch"
+        raise ArgumentError.new "Set static field parameters mismatch"
       end
 
       merged_value = '@@' + command.payload[1]

data/lib/javonet-ruby-sdk/core/handler/handler.rb

@@ -6,6 +6,7 @@ require_relative '../../core/handler/command_handler/load_library_handler'
 require_relative '../../core/handler/command_handler/invoke_static_method_handler'
 require_relative '../../core/handler/command_handler/get_static_field_handler'
 require_relative '../../core/handler/command_handler/get_instance_field_handler'
+require_relative '../../core/handler/command_handler/set_instance_field_handler'
 require_relative '../../core/handler/command_handler/create_class_instance_handler'
 require_relative '../../core/handler/command_handler/set_static_field_handler'
 require_relative '../../core/handler/command_handler/get_type_handler'
@@ -38,6 +39,7 @@ class Handler < AbstractHandler
     resolve_instance_handler = ResolveInstanceHandler.new
     casting_handler = CastingHandler.new
     get_instance_field_handler = GetInstanceFieldHandler.new
+    set_instance_field_handler = SetInstanceFieldHandler.new
     destruct_reference_handler = DestructReferenceHandler.new
     array_get_item_handler = ArrayGetItemHandler.new
     array_get_size_handler = ArrayGetSizeHandler.new
@@ -57,13 +59,13 @@ class Handler < AbstractHandler
     $handler_dict[CommandType::REFERENCE] = resolve_instance_handler
     $handler_dict[CommandType::CAST] = casting_handler
     $handler_dict[CommandType::GET_INSTANCE_FIELD] = get_instance_field_handler
+    $handler_dict[CommandType::SET_INSTANCE_FIELD] = set_instance_field_handler
     $handler_dict[CommandType::DESTRUCT_REFERENCE] = destruct_reference_handler
     $handler_dict[CommandType::ARRAY_GET_ITEM] = array_get_item_handler
     $handler_dict[CommandType::ARRAY_GET_SIZE] = array_get_size_handler
     $handler_dict[CommandType::ARRAY_GET_RANK] = array_get_rank_handler
     $handler_dict[CommandType::ARRAY_SET_ITEM] = array_set_item_handler
     $handler_dict[CommandType::ARRAY] = array_handler
-
   end
 
 

data/lib/javonet-ruby-sdk/sdk/internal/abstract/abstract_invocation_context.rb

@@ -1,13 +1,13 @@
 class AbstractInvocationContext
-  def invoke_static_method(static_method_name)
+  def invoke_static_method(*args)
     raise "method not implemented"
   end
 
-  def set_generic_type(generic_type_name)
+  def set_generic_type(*args)
     raise "method not implemented"
   end
 
-  def get_static_field(static_field_name)
+  def get_static_field(*args)
     raise "method not implemented"
   end
 
@@ -15,15 +15,19 @@ class AbstractInvocationContext
     raise "Execution method not implemented"
   end
 
-  def invoke_instance_method(method_name)
+  def invoke_instance_method(*args)
     raise "Method not implemented"
   end
 
-  def get_instance_field(instance_field_name)
+  def get_instance_field(*args)
     raise "Method not implemented"
   end
 
-  def create_instance(class_name)
+  def set_instance_field(*args)
+    raise "Method not implemented"
+  end
+
+  def create_instance(*args)
     raise "Method not implemented"
   end
 end

data/lib/javonet-ruby-sdk/sdk/internal/abstract/abstract_runtime_context.rb

@@ -1,14 +1,14 @@
 class AbstractRuntimeContext
 
-  def load_library(library_name)
+  def load_library(*args)
     raise "method not implemented"
   end
 
-  def get_module(module_name)
+  def get_module(*args)
     raise "method not implemented"
   end
 
-  def get_type(type_name)
+  def get_type(*args)
     raise "method not implemented"
   end
 

data/lib/javonet-ruby-sdk/sdk/internal/invocation_context.rb

@@ -56,7 +56,7 @@ class InvocationContext < AbstractInvocationContext
     @response_command = @interpreter.execute(@current_command, @connection_type, @tcp_ip_address)
 
     if @response_command.command_type == CommandType::EXCEPTION
-      ExceptionThrower.throw_exception(@response_command)
+      raise ExceptionThrower.throw_exception(@response_command)
     end
 
     if @response_command.command_type == CommandType::CREATE_CLASS_INSTANCE
@@ -93,6 +93,11 @@ class InvocationContext < AbstractInvocationContext
     return InvocationContext.new(@runtime_name, @connection_type, @tcp_ip_address, build_command(local_command))
   end
 
+  def set_instance_field(*args)
+    local_command = Command.new(@runtime_name, CommandType::SET_INSTANCE_FIELD, [*args])
+    return InvocationContext.new(@runtime_name, @connection_type, @tcp_ip_address, build_command(local_command))
+  end
+
   def invoke_static_method(*args)
     local_command = Command.new(@runtime_name, CommandType::INVOKE_STATIC_METHOD, [*args])
     return InvocationContext.new(@runtime_name, @connection_type, @tcp_ip_address, build_command(local_command))

data/lib/javonet-ruby-sdk/sdk/internal/runtime_context.rb

@@ -49,7 +49,7 @@ class RuntimeContext < AbstractRuntimeContext
     @response_command = @interpreter.execute(@current_command, @connection_type, @tcp_ip_address)
     @current_command = nil
     if @response_command.command_type == CommandType::EXCEPTION
-      ExceptionThrower.throw_exception(@response_command)
+      raise ExceptionThrower.throw_exception(@response_command)
     end
   end
   

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

@@ -24,6 +24,7 @@ class CommandType
   ARRAY_SET_ITEM = 22
   ARRAY = 23
   RETRIEVE_ARRAY = 24
+  SET_INSTANCE_FIELD = 25
 
   def self.get_name(command_number)
     case command_number
@@ -77,6 +78,8 @@ class CommandType
       return 'ARRAY'
     when 24
       return 'RETRIEVE_ARRAY'
+    when 25
+      return 'SET_INSTANCE_FIELD'
     end
   end
 end