diff --git modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java index f5b8824..00f8de8 100644 --- modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java +++ modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java @@ -32,7 +32,7 @@ import java.util.*; /** * Job execution request. */ -public class GridJobExecuteRequest implements Message, GridTaskMessage { +public class GridJobExecuteRequest implements Message { /** */ private static final long serialVersionUID = 0L; @@ -228,8 +228,11 @@ public class GridJobExecuteRequest implements Message, GridTaskMessage { this.cpSpi = cpSpi == null || cpSpi.isEmpty() ? null : cpSpi; } - /** {@inheritDoc} */ - @Override public IgniteUuid getSessionId() { + + /** + * @return Task session ID. + */ + public IgniteUuid getSessionId() { return sesId; } diff --git modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java index 45c916a..459ba76 100644 --- modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java +++ modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java @@ -31,7 +31,7 @@ import java.util.*; /** * Job execution response. */ -public class GridJobExecuteResponse implements Message, GridTaskMessage { +public class GridJobExecuteResponse implements Message { /** */ private static final long serialVersionUID = 0L; @@ -123,7 +123,7 @@ public class GridJobExecuteResponse implements Message, GridTaskMessage { /** * @return Task session ID. */ - @Override public IgniteUuid getSessionId() { + public IgniteUuid getSessionId() { return sesId; } diff --git modules/core/src/main/java/org/apache/ignite/internal/GridTaskMessage.java modules/core/src/main/java/org/apache/ignite/internal/GridTaskMessage.java deleted file mode 100644 index 601b6af..0000000 --- modules/core/src/main/java/org/apache/ignite/internal/GridTaskMessage.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal; - -import org.apache.ignite.lang.*; - -/** - * Grid task related message. - */ -public interface GridTaskMessage { - /** - * @return Session ID. - */ - public IgniteUuid getSessionId(); -} diff --git modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java index 55546be..b150a60 100644 --- modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java +++ modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java @@ -28,7 +28,7 @@ import java.util.*; /** * Task session request. */ -public class GridTaskSessionRequest implements Message, GridTaskMessage { +public class GridTaskSessionRequest implements Message { /** */ private static final long serialVersionUID = 0L; @@ -84,9 +84,9 @@ public class GridTaskSessionRequest implements Message, GridTaskMessage { } /** - * @return Session ID. + * @return Task session ID. */ - @Override public IgniteUuid getSessionId() { + public IgniteUuid getSessionId() { return sesId; } diff --git modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java index 0dce4ad..1dcf614 100644 --- modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java +++ modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java @@ -1153,12 +1153,6 @@ public class GridTaskProcessor extends GridProcessorAdapter { /** {@inheritDoc} */ @Override public void onMessage(UUID nodeId, Object msg) { - if (!(msg instanceof GridTaskMessage)) { - U.warn(log, "Received message of unknown type: " + msg); - - return; - } - if (msg instanceof GridJobExecuteResponse) processJobExecuteResponse(nodeId, (GridJobExecuteResponse)msg); else if (jobResOnly)