fix merge conflicts

Author: bullet-tooth

exonum-java-binding/core/src/main/java/com/exonum/binding/core/runtime/ServiceRuntimeAdapter.java

@@ -26,7 +26,7 @@
 import com.exonum.binding.core.service.NodeProxy;
 import com.exonum.binding.core.storage.database.Fork;
 import com.exonum.binding.core.storage.database.Snapshot;
-import com.exonum.binding.core.transaction.TransactionExecutionException;
+import com.exonum.binding.core.transaction.ExecutionException;
 import com.exonum.core.messages.Runtime.ArtifactId;
 import com.exonum.core.messages.Runtime.InstanceSpec;
 import com.exonum.core.messages.Runtime.InstanceState;
@@ -132,8 +132,11 @@ private static ArtifactId parseArtifact(byte[] artifactId) {
    *     protobuf message
    * @param configuration the service initial configuration parameters as a serialized protobuf
    *     message
-   * @see ServiceRuntime#initiateAddingService(Fork, ServiceInstanceSpec, byte[])
    * @throws CloseFailuresException if there was a failure in destroying some native peers
+   * @throws ExecutionException if the service initialization failed
+   * @throws UnexpectedExecutionException if the service initialization failed
+   *     with an unexpected exception
+   * @see ServiceRuntime#initiateAddingService(Fork, ServiceInstanceSpec, byte[])
    */
   void initiateAddingService(long forkHandle, byte[] instanceSpec, byte[] configuration)
       throws CloseFailuresException {
@@ -188,16 +191,16 @@ private static ServiceInstanceSpec parseInstanceSpec(byte[] instanceSpec) {
    *      inner transactions); or 0 when the caller is an external message
    * @param txMessageHash the hash of the transaction message
    * @param authorPublicKey the public key of the transaction author
-   * @throws TransactionExecutionException if the transaction execution failed
-   * @throws UnexpectedTransactionExecutionException if the transaction execution failed
-   *     with an unexpected exception with no error code
+   * @throws ExecutionException if the transaction execution failed
+   * @throws UnexpectedExecutionException if the transaction execution failed
+   *     with an unexpected exception
    * @throws IllegalArgumentException if any argument is not valid
    * @see ServiceRuntime#executeTransaction(int, String, int, byte[], Fork, int, HashCode,
    *      PublicKey)
    */
   void executeTransaction(int serviceId, String interfaceName, int txId, byte[] arguments,
       long forkNativeHandle, int callerServiceId, byte[] txMessageHash, byte[] authorPublicKey)
-      throws TransactionExecutionException, CloseFailuresException {
+      throws CloseFailuresException {
 
     try (Cleaner cleaner = new Cleaner("executeTransaction")) {
       Fork fork = viewFactory.createFork(forkNativeHandle, cleaner);
@@ -216,6 +219,9 @@ void executeTransaction(int serviceId, String interfaceName, int txId, byte[] ar
    *
    * @param forkHandle a handle to the native fork object, which must support checkpoints
    *                   and rollbacks
+   * @throws ExecutionException if the transaction execution failed
+   * @throws UnexpectedExecutionException if the transaction execution failed
+   *     with an unexpected exception
    * @throws CloseFailuresException if there was a failure in destroying some native peers
    * @see ServiceRuntime#afterTransactions(int, Fork)
    */