javonet-ruby-sdk 2.3.0 → 2.4.0

data/lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/lib/Javonet/Core/Transmitter/PerlTransmitter.pm

@@ -6,36 +6,41 @@ use aliased 'Javonet::Core::Transmitter::PerlTransmitterWrapper' => 'PerlTransmi
 use Exporter;
 
 our @ISA = qw(Exporter);
-our @EXPORT = qw(send_command activate_with_licence_file activate_with_credentials activate_with_credentials_and_proxy);
+our @EXPORT = qw(send_command activate_with_license_file activate_with_credentials activate_with_credentials_and_proxy);
 
 sub send_command {
     my ($self, $message_ref) = @_;
-    my @response = PerlTransmitterWrapper->send_command_($message_ref);
+    my @response = PerlTransmitterWrapper->send_command($message_ref);
     return @response;
 }
 
-sub activate_with_licence_file {
+sub activate_with_license_file {
     return __activate();
 }
 
 sub activate_with_credentials {
-    my($self, $licenceKey) = @_;
-    return __activate($licenceKey);
+    my($self, $licenseKey) = @_;
+    return __activate($licenseKey);
 }
 
 sub activate_with_credentials_and_proxy {
-    my($self,  $licenceKey, $proxyHost, $proxyUserName, $proxyPassword) = @_;
-    return __activate($licenceKey, $proxyHost, $proxyUserName, $proxyPassword);
+    my($self,  $licenseKey, $proxyHost, $proxyUserName, $proxyPassword) = @_;
+    return __activate($licenseKey, $proxyHost, $proxyUserName, $proxyPassword);
 }
 
 sub __activate {
-    my($licenceKey, $proxyHost, $proxyUserName, $proxyPassword) = @_;
+    my($licenseKey, $proxyHost, $proxyUserName, $proxyPassword) = @_;
     #set default values
-    $licenceKey //="";
+    $licenseKey //="";
     $proxyHost //="";
     $proxyUserName //="";
     $proxyPassword //="";
-    return PerlTransmitterWrapper->activate_($licenceKey, $proxyHost, $proxyUserName, $proxyPassword);
+    return PerlTransmitterWrapper->activate($licenseKey, $proxyHost, $proxyUserName, $proxyPassword);
+}
+
+sub set_config_source {
+    my ($self, $config_path) = @_;
+    PerlTransmitterWrapper->set_config_source($config_path);
 }
 
 1;

data/lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/lib/Javonet/Core/Transmitter/PerlTransmitterWrapper.pm

@@ -11,12 +11,13 @@ my $ffi;
 our @ISA = qw(Exporter);
 our @EXPORT = qw(send_command_ activate_);
 
-my $send_command;
-my $read_response;
-my $activate;
-my $get_native_error;
+my $send_command_native;
+my $read_response_native;
+my $activate_native;
+my $get_native_error_native;
+my $set_config_source_native;
 
-sub initialize_ {
+sub initialize {
     my $osname = $^O;
     {
         $ffi = FFI::Platypus->new(api => 1);
@@ -34,21 +35,22 @@ sub initialize_ {
             $perl_native_lib = 'Binaries/Native/Windows/X64/JavonetPerlRuntimeNative.dll';
         }
         $ffi->lib("$current_dir/$perl_native_lib");
-        $send_command = $ffi->function('SendCommand' => [ 'uchar[]', 'int' ] => 'int');
-        $read_response = $ffi->function('ReadResponse' => [ 'uchar[]', 'int' ] => 'int');
-        $activate = $ffi->function('Activate' => ['string', 'string', 'string', 'string' ] => 'int');
-        $get_native_error = $ffi->function('GetNativeError' => [] => 'string')
+        $send_command_native = $ffi->function('SendCommand' => [ 'uchar[]', 'int' ] => 'int');
+        $read_response_native = $ffi->function('ReadResponse' => [ 'uchar[]', 'int' ] => 'int');
+        $activate_native = $ffi->function('Activate' => ['string', 'string', 'string', 'string' ] => 'int');
+        $get_native_error_native = $ffi->function('GetNativeError' => [] => 'string');
+        $set_config_source_native = $ffi->function('SetConfigSource' => ['string'] => 'int');
     }
 }
 
-sub send_command_ {
+sub send_command {
     my ($self, $message_ref) = @_;
     my @message_array = @$message_ref;
-    my $response_array_len = $send_command->(\@message_array, scalar @message_array);
+    my $response_array_len = $send_command_native->(\@message_array, scalar @message_array);
 
     if ($response_array_len > 0) {
         my @response_array = (1 .. $response_array_len);
-        $read_response->(\@response_array, $response_array_len);
+        $read_response_native->(\@response_array, $response_array_len);
         return @response_array;
     }
     elsif ($response_array_len == 0) {
@@ -56,22 +58,35 @@ sub send_command_ {
         die "$error_message";
     }
     else {
-        my $error_message = $get_native_error->();
+        my $error_message = $get_native_error_native->();
         die "Javonet native error code: $response_array_len. $error_message";
     }
 }
 
-sub activate_ {
-    my ($self, $licenceKey, $proxyHost, $proxyUserName, $proxyPassword) = @_;
-    initialize_();
-    my $activation_result = $activate->($licenceKey, $proxyHost, $proxyUserName, $proxyPassword);
+sub activate {
+    my ($self, $licenseKey, $proxyHost, $proxyUserName, $proxyPassword) = @_;
+    initialize();
+    my $activation_result = $activate_native->($licenseKey, $proxyHost, $proxyUserName, $proxyPassword);
     if ($activation_result < 0) {
-        my $error_message = $get_native_error->();
-        die "Javonet activation result: $activation_result. $error_message";
+        my $error_message = $get_native_error_native->();
+        die "Javonet activation result: $activation_result. Native error message: $error_message";
     }
     else {
         return $activation_result;
     }
 }
 
+sub set_config_source {
+    my ($self, $config_path) = @_;
+    initialize();
+    my $set_config_result = $set_config_source_native->($config_path);
+    if ($set_config_result < 0) {
+        my $error_message = $get_native_error_native->();
+        die "Javonet set config source result: $set_config_result. Native error message: $error_message";
+    }
+    else {
+        return $set_config_result;
+    }
+}
+
 1;

data/lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/lib/Javonet/Javonet.pm

@@ -4,37 +4,45 @@ use warnings FATAL => 'all';
 use Moose;
 use lib 'lib';
 use aliased 'Javonet::Sdk::Internal::RuntimeFactory' => 'RuntimeFactory';
-use aliased 'Javonet::Core::Transmitter::PerlTransmitter' => 'Transmitter', qw(activate_with_licence_file activate_with_credentials activate_with_credentials_and_proxy);
+use aliased 'Javonet::Core::Transmitter::PerlTransmitter' => 'Transmitter', qw(activate_with_license_file activate_with_credentials activate_with_credentials_and_proxy);
 
 BEGIN {
-    Transmitter->activate_with_licence_file()
+    Transmitter->activate_with_license_file()
 }
 
 sub activate {
     if(@_ == 1) {
-        return Transmitter->activate_with_licence_file();
+        return Transmitter->activate_with_license_file();
     }
     if(@_ == 2) {
-        my($self, $licenceKey) = @_;
-        return Transmitter->activate_with_credentials($licenceKey);
+        my($self, $licenseKey) = @_;
+        return Transmitter->activate_with_credentials($licenseKey);
     } elsif (@_ > 2) {
-        my($self, $licenceKey, $proxyHost, $proxyUserName, $proxyPassword) = @_;
+        my($self, $licenseKey, $proxyHost, $proxyUserName, $proxyPassword) = @_;
         $proxyUserName //="";
         $proxyPassword //="";
-        return Transmitter->activate_with_credentials_and_proxy($licenceKey, $proxyHost, $proxyUserName, $proxyPassword);
+        return Transmitter->activate_with_credentials_and_proxy($licenseKey, $proxyHost, $proxyUserName, $proxyPassword);
     }
 
 }
 
 sub in_memory {
-    return RuntimeFactory->new(Javonet::Sdk::Internal::ConnectionType::get_connection_type('InMemory'));
+    return RuntimeFactory->new(Javonet::Sdk::Internal::ConnectionType::get_connection_type('InMemory'), undef, undef);
 }
 
 sub tcp {
     # additional shift is needed to pass second argument
     my $class = shift;
     my $address = shift;
-    return RuntimeFactory->new(Javonet::Sdk::Internal::ConnectionType::get_connection_type('Tcp'), $address);
+    return RuntimeFactory->new(Javonet::Sdk::Internal::ConnectionType::get_connection_type('Tcp'), $address, undef);
+}
+
+sub with_config {
+    my ($self, $config_path) = @_;
+    # Sets the configuration source
+    Transmitter->set_config_source($config_path);
+    # Returns a new RuntimeFactory instance configured with a custom configuration file
+    return RuntimeFactory->new(Javonet::Sdk::Internal::ConnectionType::get_connection_type('WithConfig'), undef, $config_path);
 }
 
 1;

data/lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/lib/Javonet/Sdk/Internal/ConnectionType.pm

@@ -10,7 +10,8 @@ our @EXPORT = qw(get_connection_type);
 
 my %connection_type = (
     'InMemory'       => 0,
-    'Tcp'    => 1
+    'Tcp'    => 1,
+    'WithConfig' => 2,
 );
 
 sub get_connection_type {

data/lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/lib/Javonet/Sdk/Internal/RuntimeContext.pm

@@ -14,6 +14,7 @@ extends 'Javonet::Sdk::Internal::Abstract::AbstractModuleContext',
 my $perl_handler = Javonet::Core::Handler::PerlHandler->new();
 our %memoryRuntimeContexts;
 our %networkRuntimeContexts;
+our %configRuntimeContexts;
 
 #@override
 sub new {
@@ -33,30 +34,51 @@ sub get_instance {
     my $runtime_lib = shift;
     my $connection_type = shift;
     my $tcp_address = shift;
-    if($connection_type eq Javonet::Sdk::Internal::ConnectionType::get_connection_type("Tcp") && $tcp_address ne "") {
-        if(exists $networkRuntimeContexts{$tcp_address}) {
-            my $runtimeCtx = $networkRuntimeContexts{$tcp_address};
+    my $path = shift;
+
+    if($connection_type eq Javonet::Sdk::Internal::ConnectionType::get_connection_type("InMemory")) {
+        if(exists $memoryRuntimeContexts{$runtime_lib}) {
+            my $runtimeCtx = $memoryRuntimeContexts{$runtime_lib};
+            $runtimeCtx->{current_command} = undef();
+            return $runtimeCtx;
+        }
+        else {
+            my $runtimeCtx = Javonet::Sdk::Internal::RuntimeContext->new($runtime_lib, $connection_type, '');
+            $memoryRuntimeContexts{$runtime_lib} = $runtimeCtx;
+            return($runtimeCtx);
+        }
+    }
+
+    if($connection_type eq Javonet::Sdk::Internal::ConnectionType::get_connection_type("Tcp")) {
+        my $networkRuntimeContextsKey = $runtime_lib . $tcp_address;
+        if(exists $networkRuntimeContexts{$networkRuntimeContextsKey}) {
+            my $runtimeCtx = $networkRuntimeContexts{$networkRuntimeContextsKey};
             $runtimeCtx->{current_command} = undef();
             return $runtimeCtx;
         }
         else {
             my $runtimeCtx = Javonet::Sdk::Internal::RuntimeContext->new($runtime_lib, $connection_type, $tcp_address);
-            $networkRuntimeContexts{$tcp_address} = $runtimeCtx;
+            $networkRuntimeContexts{$networkRuntimeContextsKey} = $runtimeCtx;
             return($runtimeCtx);
         }
     }
-    else {
-        if(exists $memoryRuntimeContexts{$runtime_lib}) {
-            my $runtimeCtx = $memoryRuntimeContexts{$runtime_lib};
+
+    if($connection_type eq Javonet::Sdk::Internal::ConnectionType::get_connection_type("WithConfig")) {
+        my $configRuntimeContextsKey = $runtime_lib . $path;
+        if(exists $configRuntimeContexts{$configRuntimeContextsKey}) {
+            my $runtimeCtx = $configRuntimeContexts{$configRuntimeContextsKey};
             $runtimeCtx->{current_command} = undef();
             return $runtimeCtx;
         }
         else {
-            my $runtimeCtx = Javonet::Sdk::Internal::RuntimeContext->new($runtime_lib, $connection_type, '');
-            $memoryRuntimeContexts{$runtime_lib} = $runtimeCtx;
+            my $runtimeCtx = Javonet::Sdk::Internal::RuntimeContext->new($runtime_lib, $connection_type, $tcp_address);
+            $configRuntimeContexts{$configRuntimeContextsKey} = $runtimeCtx;
             return($runtimeCtx);
         }
     }
+
+    
+
 }
 
 

data/lib/javonet-ruby-sdk/Binaries/Perl/Linux/X64/lib/Javonet/Sdk/Internal/RuntimeFactory.pm

@@ -7,33 +7,35 @@ extends 'Javonet::Sdk::Internal::Abstract::AbstractRuntimeFactory';
 
 my $connection_type;
 my $tcp_address;
+my $path;
 
 #@override
 sub new {
     my $class = shift;
     my $self = {
         connection_type => shift,
-        tcp_address     => shift
+        tcp_address     => shift,
+        path           => shift
     };
     $connection_type = $self->{connection_type};
     $tcp_address = $self->{tcp_address};
+    $path = $self->{path};
     if($connection_type eq Javonet::Sdk::Internal::ConnectionType::get_connection_type('Tcp')){
         if(not( defined $tcp_address || $tcp_address eq "" )){
             die("Error: Tcp ip address must be specified");
         }
     }
     bless $self, $class;
-
     return $self;
 }
 
-
 #@override
 sub clr {
     return Javonet::Sdk::Internal::RuntimeContext::get_instance(
         Javonet::Sdk::Core::RuntimeLib::get_runtime('Clr'),
         $connection_type,
-        $tcp_address
+        $tcp_address,
+        $path
     );
 }
 
@@ -42,7 +44,8 @@ sub jvm {
     return Javonet::Sdk::Internal::RuntimeContext::get_instance(
         Javonet::Sdk::Core::RuntimeLib::get_runtime('Jvm'),
         $connection_type,
-        $tcp_address
+        $tcp_address,
+        $path
     );
 }
 
@@ -51,7 +54,8 @@ sub netcore {
     return Javonet::Sdk::Internal::RuntimeContext::get_instance(
         Javonet::Sdk::Core::RuntimeLib::get_runtime('Netcore'),
         $connection_type,
-        $tcp_address
+        $tcp_address,
+        $path
     );
 }
 
@@ -60,7 +64,8 @@ sub perl {
     return Javonet::Sdk::Internal::RuntimeContext::get_instance(
         Javonet::Sdk::Core::RuntimeLib::get_runtime('Perl'),
         $connection_type,
-        $tcp_address
+        $tcp_address,
+        $path
     );
 }
 
@@ -69,7 +74,8 @@ sub ruby {
     return Javonet::Sdk::Internal::RuntimeContext::get_instance(
         Javonet::Sdk::Core::RuntimeLib::get_runtime('Ruby'),
         $connection_type,
-        $tcp_address
+        $tcp_address,
+        $path
     );
 }
 
@@ -78,7 +84,8 @@ sub nodejs {
     return Javonet::Sdk::Internal::RuntimeContext::get_instance(
         Javonet::Sdk::Core::RuntimeLib::get_runtime('Nodejs'),
         $connection_type,
-        $tcp_address
+        $tcp_address,
+        $path
     );
 }
 
@@ -87,7 +94,8 @@ sub python {
     return Javonet::Sdk::Internal::RuntimeContext::get_instance(
         Javonet::Sdk::Core::RuntimeLib::get_runtime('Python'),
         $connection_type,
-        $tcp_address
+        $tcp_address,
+        $path
     );
 }