Improve exceptions handling in service runtime [ECR-3077]. (#967)

Switched from `check_error_on_exception` to `panic_on_exception`
as there is no need to distinguish between them.

Author: skletsun

exonum-java-binding/core/rust/integration_tests/tests/service_runtime.rs

@@ -70,7 +70,7 @@ fn load_nonexistent_artifact() {
     let artifact_path = "nonexistent_artifact.jar";
 
     assert_panics(
-        &format!("Unable to load artifact {}", artifact_path),
+        &format!("Failed to load the service from {}", artifact_path),
         || runtime.load_artifact(&artifact_path),
     );
 }
@@ -84,7 +84,7 @@ fn load_artifact_twice() {
     // The second loading attempt should fail.
     assert_panics(
         &format!(
-            "Unable to load artifact {}",
+            "Failed to load the service from {}",
             artifact_path.to_string_lossy()
         ),
         || runtime.load_artifact(&artifact_path),
@@ -96,9 +96,10 @@ fn load_failing_artifact() {
     let runtime = get_runtime();
     let artifact_path = create_service_artifact_non_loadable(runtime.get_executor());
 
-    assert_panics("Unable to load artifact", || {
-        runtime.load_artifact(&artifact_path)
-    });
+    assert_panics(
+        "Java exception: com.exonum.binding.core.runtime.ServiceLoadingException;",
+        || runtime.load_artifact(&artifact_path),
+    );
 }
 
 #[test]
@@ -108,7 +109,7 @@ fn non_instantiable_service() {
     let artifact_id = runtime.load_artifact(&artifact_path);
 
     assert_panics(
-        &format!("Unable to create service for artifact_id [{}]", artifact_id),
+        "com.exonum.binding.fakes.services.invalidservice.NonInstantiableService",
         || runtime.create_service(&artifact_id),
     );
 }
@@ -117,10 +118,9 @@ fn non_instantiable_service() {
 fn create_service_for_unknown_artifact() {
     let runtime = get_runtime();
 
-    assert_panics(
-        "Unable to create service for artifact_id [unknown:artifact:id]",
-        || runtime.create_service("unknown:artifact:id"),
-    );
+    assert_panics("Unknown artifactId: unknown:artifact:id", || {
+        runtime.create_service("unknown:artifact:id")
+    });
 }
 
 // Creates a new instance of JavaServiceRuntime for same JVM.

exonum-java-binding/core/rust/src/runtime/java_service_runtime.rs

@@ -24,7 +24,7 @@ use jni::{
 use proxy::ServiceProxy;
 use runtime::config::{self, Config, InternalConfig, JvmConfig, RuntimeConfig};
 use std::{path::Path, sync::Arc};
-use utils::{check_error_on_exception, convert_to_string, unwrap_jni};
+use utils::{convert_to_string, panic_on_exception, unwrap_jni};
 use Executor;
 
 const SERVICE_RUNTIME_BOOTSTRAP_PATH: &str = "com/exonum/binding/app/ServiceRuntimeBootstrap";
@@ -84,7 +84,7 @@ impl JavaServiceRuntime {
     pub fn create_service(&self, artifact_id: &str) -> ServiceProxy {
         unwrap_jni(self.executor.with_attached(|env| {
             let artifact_id_obj: JObject = env.new_string(artifact_id)?.into();
-            let service = check_error_on_exception(
+            let service = panic_on_exception(
                 env,
                 env.call_method(
                     self.service_runtime.as_obj(),
@@ -93,12 +93,6 @@ impl JavaServiceRuntime {
                     &[artifact_id_obj.into()],
                 ),
             )
-            .unwrap_or_else(|err_msg| {
-                panic!(
-                    "Unable to create service for artifact_id [{}]: {}",
-                    artifact_id, err_msg
-                )
-            })
             .l()?;
             let service = env.new_global_ref(service)?;
             Ok(ServiceProxy::from_global_ref(
@@ -117,7 +111,7 @@ impl JavaServiceRuntime {
         unwrap_jni(self.executor.with_attached(|env| {
             let artifact_path = artifact_path.as_ref().to_str().unwrap();
             let artifact_path_obj: JObject = env.new_string(artifact_path)?.into();
-            let artifact_id = check_error_on_exception(
+            let artifact_id = panic_on_exception(
                 env,
                 env.call_method(
                     self.service_runtime.as_obj(),
@@ -126,9 +120,6 @@ impl JavaServiceRuntime {
                     &[artifact_path_obj.into()],
                 ),
             )
-            .unwrap_or_else(|err_msg| {
-                panic!("Unable to load artifact {}: {}", artifact_path, err_msg)
-            })
             .l()?;
             convert_to_string(env, artifact_id)
         }))

exonum-java-binding/core/rust/src/utils/errors.rs

@@ -47,6 +47,9 @@ pub fn panic_on_exception<T>(env: &JNIEnv, result: JniResult<T>) -> T {
 /// Java exceptions are converted into `Error`s with their descriptions, Java errors and JNI errors
 /// are treated as unrecoverable and result in a panic.
 ///
+/// *This method shall be used only if it is needed to determine if a Java Exception
+/// is an instance of `java.lang.Error` or `java.lang.Exception`.*
+///
 /// Panics:
 /// - Panics if there is some JNI error.
 /// - If there is a pending Java exception that is a subclass of `java.lang.Error`.