IGNITE-26827 Minor refactoring after ErrorMessage updates (#12496)

Author: shishkovilja

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java

@@ -22,7 +22,6 @@
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.internal.Order;
-import org.apache.ignite.internal.managers.communication.ErrorMessage;
 import org.apache.ignite.internal.processors.cache.GridCacheContext;
 import org.apache.ignite.internal.processors.cache.GridCacheDeployable;
 import org.apache.ignite.internal.processors.cache.GridCacheIdMessage;
@@ -117,12 +116,12 @@ public void onError(IgniteCheckedException err) {
         if (errs == null)
             errs = new UpdateErrors();
 
-        errs.errorMessage(new ErrorMessage(err));
+        errs.error(err);
     }
 
     /** {@inheritDoc} */
     @Override public Throwable error() {
-        return errs != null ? errs.errorMessage().error() : null;
+        return errs != null ? errs.error() : null;
     }
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java

@@ -206,9 +206,9 @@ else if (rcvAll)
         UpdateErrors errors = res.errors();
 
         if (errors != null) {
-            assert errors.errorMessage() != null;
+            assert errors.error() != null;
 
-            completeFuture(null, errors.errorMessage().error(), res.futureId());
+            completeFuture(null, errors.error(), res.futureId());
 
             return;
         }

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java

@@ -332,9 +332,9 @@ else if (rcvAll)
         UpdateErrors errors = res.errors();
 
         if (errors != null) {
-            assert errors.errorMessage() != null;
+            assert errors.error() != null;
 
-            completeFuture(null, errors.errorMessage().error(), res.futureId());
+            completeFuture(null, errors.error(), res.futureId());
 
             return;
         }

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java

@@ -23,7 +23,6 @@
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.internal.Order;
-import org.apache.ignite.internal.managers.communication.ErrorMessage;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.processors.cache.CacheObject;
 import org.apache.ignite.internal.processors.cache.GridCacheContext;
@@ -188,12 +187,12 @@ public void error(IgniteCheckedException err) {
         if (errs == null)
             errs = new UpdateErrors();
 
-        errs.errorMessage(new ErrorMessage(err));
+        errs.error(err);
     }
 
     /** {@inheritDoc} */
     @Override public Throwable error() {
-        return errs != null ? errs.errorMessage().error() : null;
+        return errs != null ? errs.error() : null;
     }
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java

@@ -60,6 +60,20 @@ public UpdateErrors(Throwable err) {
         errMsg = new ErrorMessage(err);
     }
 
+    /**
+     * @param err Error.
+     */
+    public void error(Throwable err) {
+        errMsg = new ErrorMessage(err);
+    }
+
+    /**
+     * @return Error.
+     */
+    public Throwable error() {
+        return ErrorMessage.error(errMsg);
+    }
+
     /**
      * @param errMsg New error message.
      */