ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/45] incubator-ignite git commit: GridTaskMessage interface is deleted
Date Fri, 10 Apr 2015 15:26:51 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-676 5c081bfc5 -> 231602d91


GridTaskMessage interface is deleted


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/641b713d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/641b713d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/641b713d

Branch: refs/heads/ignite-676
Commit: 641b713d65f692a1165459f1cce6c8ca0542e591
Parents: 682dcd1
Author: Denis Magda <dmagda@gridgain.com>
Authored: Wed Apr 8 13:13:32 2015 +0300
Committer: Denis Magda <dmagda@gridgain.com>
Committed: Wed Apr 8 13:13:32 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/GridJobExecuteRequest.java  |  9 ++++--
 .../ignite/internal/GridJobExecuteResponse.java |  4 +--
 .../apache/ignite/internal/GridTaskMessage.java | 30 --------------------
 .../ignite/internal/GridTaskSessionRequest.java |  6 ++--
 .../processors/task/GridTaskProcessor.java      |  6 ----
 5 files changed, 11 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/641b713d/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
index f5b8824..00f8de8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
+++ b/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;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/641b713d/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
index 45c916a..459ba76 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
+++ b/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;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/641b713d/modules/core/src/main/java/org/apache/ignite/internal/GridTaskMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskMessage.java
deleted file mode 100644
index 601b6af..0000000
--- a/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();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/641b713d/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
index 55546be..b150a60 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
+++ b/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;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/641b713d/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index 0dce4ad..1dcf614 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++ b/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)


Mime
View raw message