ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: ignite-637: rename and fix scala-compilation
Date Wed, 08 Apr 2015 13:02:45 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-635 0496d17ff -> efae4778f


ignite-637: rename and fix scala-compilation


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

Branch: refs/heads/ignite-635
Commit: efae4778f5ce471eb95ba0b4e95bfeed10dcb8dd
Parents: 0496d17
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Wed Apr 8 15:20:48 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Wed Apr 8 15:20:48 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteCluster.java   |  8 +-
 .../java/org/apache/ignite/StartHostResult.java | 86 --------------------
 .../java/org/apache/ignite/StartNodeResult.java | 86 ++++++++++++++++++++
 .../cluster/IgniteClusterAsyncImpl.java         | 12 +--
 .../internal/cluster/IgniteClusterImpl.java     | 12 +--
 .../commands/start/VisorStartCommand.scala      |  4 +-
 6 files changed, 104 insertions(+), 104 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efae4778/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
index a4c1383..5e4b3aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
@@ -169,12 +169,12 @@ public interface IgniteCluster extends ClusterGroup, IgniteAsyncSupport
{
      *      nodes on the host than expected.
      * @param timeout Connection timeout.
      * @param maxConn Number of parallel SSH connections to one host.
-     * @return Collection of start host results, each containing host name, result (success
or failure)
+     * @return Collection of start node results, each containing host name, result (success
or failure)
      *      and error message (if any).
      * @throws IgniteException In case of error.
      */
     @IgniteAsyncSupported
-    public Collection<StartHostResult> startNodes(File file, boolean restart, int timeout,
+    public Collection<StartNodeResult> startNodes(File file, boolean restart, int timeout,
         int maxConn) throws IgniteException;
 
     /**
@@ -271,12 +271,12 @@ public interface IgniteCluster extends ClusterGroup, IgniteAsyncSupport
{
      *      nodes on the host than expected.
      * @param timeout Connection timeout in milliseconds.
      * @param maxConn Number of parallel SSH connections to one host.
-     * @return Collection of start host results, each containing host name, result (success
or failure)
+     * @return Collection of start node results, each containing host name, result (success
or failure)
      *      and error message (if any).
      * @throws IgniteException In case of error.
      */
     @IgniteAsyncSupported
-    public Collection<StartHostResult> startNodes(Collection<Map<String, Object>>
hosts,
+    public Collection<StartNodeResult> startNodes(Collection<Map<String, Object>>
hosts,
         @Nullable Map<String, Object> dflts, boolean restart, int timeout, int maxConn)
throws IgniteException;
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efae4778/modules/core/src/main/java/org/apache/ignite/StartHostResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/StartHostResult.java b/modules/core/src/main/java/org/apache/ignite/StartHostResult.java
deleted file mode 100644
index f36bbfd..0000000
--- a/modules/core/src/main/java/org/apache/ignite/StartHostResult.java
+++ /dev/null
@@ -1,86 +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;
-
-/**
- * Start host result information.
- */
-public class StartHostResult {
-    /** Host name. */
-    private String hostName;
-    
-    /** Result (success or failure). */
-    private boolean success;
-
-    /** Error message (if any) */
-    private String error;
-
-    /**
-     * Gets host name.
-     *  
-     * @return Host name.
-     */
-    public String getHostName() {
-        return hostName;
-    }
-
-    /**
-     * Sets host name.
-     *  
-     * @param hostName Host name.
-     */
-    public void setHostName(String hostName) {
-        this.hostName = hostName;
-    }
-
-    /**
-     * Gets result of success or failure.
-     *  
-     * @return Success or failure. <code>true</code> if success.
-     */
-    public boolean isSuccess() {
-        return success;
-    }
-
-    /**
-     * Sets success result.
-     *  
-     * @param success Success result.
-     */
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
-    /**
-     * Gets error message if any.
-     *  
-     * @return Error massage.
-     */
-    public String getError() {
-        return error;
-    }
-
-    /**
-     * Sets error message.
-     *  
-     * @param error Error message.
-     */
-    public void setError(String error) {
-        this.error = error;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efae4778/modules/core/src/main/java/org/apache/ignite/StartNodeResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/StartNodeResult.java b/modules/core/src/main/java/org/apache/ignite/StartNodeResult.java
new file mode 100644
index 0000000..cd8519e
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/StartNodeResult.java
@@ -0,0 +1,86 @@
+/*
+ * 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;
+
+/**
+ * Start host result information.
+ */
+public class StartNodeResult {
+    /** Host name. */
+    private String hostName;
+    
+    /** Result (success or failure). */
+    private boolean success;
+
+    /** Error message (if any) */
+    private String error;
+
+    /**
+     * Gets host name.
+     *  
+     * @return Host name.
+     */
+    public String getHostName() {
+        return hostName;
+    }
+
+    /**
+     * Sets host name.
+     *  
+     * @param hostName Host name.
+     */
+    public void setHostName(String hostName) {
+        this.hostName = hostName;
+    }
+
+    /**
+     * Gets result of success or failure.
+     *  
+     * @return Success or failure. <code>true</code> if success.
+     */
+    public boolean isSuccess() {
+        return success;
+    }
+
+    /**
+     * Sets success result.
+     *  
+     * @param success Success result.
+     */
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    /**
+     * Gets error message if any.
+     *  
+     * @return Error massage.
+     */
+    public String getError() {
+        return error;
+    }
+
+    /**
+     * Sets error message.
+     *  
+     * @param error Error message.
+     */
+    public void setError(String error) {
+        this.error = error;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efae4778/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
index e3d6f60..5c4e5a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
@@ -98,7 +98,7 @@ public class IgniteClusterAsyncImpl extends AsyncSupportAdapter<IgniteCluster>
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<StartHostResult> startNodes(File file,
+    @Override public Collection<StartNodeResult> startNodes(File file,
         boolean restart,
         int timeout,
         int maxConn)
@@ -106,10 +106,10 @@ public class IgniteClusterAsyncImpl extends AsyncSupportAdapter<IgniteCluster>
         try {
             Collection<GridTuple3<String, Boolean, String>> tuples = saveOrGet(cluster.startNodesAsync(file,
restart, timeout, maxConn));
 
-            Collection<StartHostResult> res = new ArrayList<>();
+            Collection<StartNodeResult> res = new ArrayList<>();
 
             for (GridTuple3<String, Boolean, String> t : tuples) {
-                StartHostResult r = new StartHostResult();
+                StartNodeResult r = new StartNodeResult();
 
                 r.setHostName(t.get1());
                 r.setSuccess(t.get2());
@@ -126,7 +126,7 @@ public class IgniteClusterAsyncImpl extends AsyncSupportAdapter<IgniteCluster>
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<StartHostResult> startNodes(
+    @Override public Collection<StartNodeResult> startNodes(
         Collection<Map<String, Object>> hosts,
         @Nullable Map<String, Object> dflts,
         boolean restart,
@@ -136,10 +136,10 @@ public class IgniteClusterAsyncImpl extends AsyncSupportAdapter<IgniteCluster>
         try {
             Collection<GridTuple3<String, Boolean, String>> tuples = saveOrGet(cluster.startNodesAsync(hosts,
dflts, restart, timeout, maxConn));
 
-            Collection<StartHostResult> res = new ArrayList<>();
+            Collection<StartNodeResult> res = new ArrayList<>();
 
             for (GridTuple3<String, Boolean, String> t : tuples) {
-                StartHostResult r = new StartHostResult();
+                StartNodeResult r = new StartNodeResult();
 
                 r.setHostName(t.get1());
                 r.setSuccess(t.get2());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efae4778/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
index 73a6e5b..65edd11 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
@@ -189,7 +189,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements
IgniteClus
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<StartHostResult> startNodes(File file,
+    @Override public Collection<StartNodeResult> startNodes(File file,
         boolean restart,
         int timeout,
         int maxConn)
@@ -198,10 +198,10 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements
IgniteClus
         try {
             Collection<GridTuple3<String, Boolean, String>> tuples = startNodesAsync(file,
restart, timeout, maxConn).get();
 
-            Collection<StartHostResult> res = new ArrayList<>();
+            Collection<StartNodeResult> res = new ArrayList<>();
 
             for (GridTuple3<String, Boolean, String> t : tuples) {
-                StartHostResult r = new StartHostResult();
+                StartNodeResult r = new StartNodeResult();
 
                 r.setHostName(t.get1());
                 r.setSuccess(t.get2());
@@ -218,7 +218,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements
IgniteClus
     }
 
     /** {@inheritDoc} */
-    @Override public Collection<StartHostResult> startNodes(Collection<Map<String,
Object>> hosts,
+    @Override public Collection<StartNodeResult> startNodes(Collection<Map<String,
Object>> hosts,
         @Nullable Map<String, Object> dflts,
         boolean restart,
         int timeout,
@@ -228,10 +228,10 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements
IgniteClus
         try {
             Collection<GridTuple3<String, Boolean, String>> tuples = startNodesAsync(hosts,
dflts, restart, timeout, maxConn).get();
 
-            Collection<StartHostResult> res = new ArrayList<>();
+            Collection<StartNodeResult> res = new ArrayList<>();
 
             for (GridTuple3<String, Boolean, String> t : tuples) {
-                StartHostResult r = new StartHostResult();
+                StartNodeResult r = new StartNodeResult();
 
                 r.setHostName(t.get1());
                 r.setSuccess(t.get2());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efae4778/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
index 5342fc1..a6de108 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
@@ -228,7 +228,7 @@ class VisorStartCommand {
 
                 try
                     res = ignite.cluster.startNodes(file, restart, timeout, maxConn).map(t
=> {
-                        Result(t.get1, t.get2, t.get3)
+                        Result(t.getHostName, t.isSuccess, t.getError)
                     }).toSeq
                 catch {
                     case e: IgniteException => scold(e.getMessage).^^
@@ -284,7 +284,7 @@ class VisorStartCommand {
 
                 try
                     res = ignite.cluster.startNodes(asJavaCollection(Seq(params)), null,
restart, timeout, maxConn).
-                        map(t => Result(t.get1, t.get2, t.get3)).toSeq
+                        map(t => Result(t.getHostName, t.isSuccess, t.getError)).toSeq
                 catch {
                     case e: IgniteException => scold(e.getMessage).^^
                     case _: RejectedExecutionException => scold("Failed due to system
error.").^^


Mime
View raw message