[incubator-tubemq] branch master updated: [TUBEMQ-19] Correct parameter names to fit in camel case

[ti...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git


The following commit(s) were added to refs/heads/master by this push:
     new 6d21615  [TUBEMQ-19] Correct parameter names to fit in camel case
6d21615 is described below

commit 6d21615b91d61d79f44d694b5d2dd4f24f89ab9d
Author: Tboy <gu...@immomo.com>
AuthorDate: Tue Jan 14 10:49:43 2020 +0800

    [TUBEMQ-19] Correct parameter names to fit in camel case
    
    - JVMClusterUtil#startup : regionservers -> regionServers
    - RowLock#getLock : lockid -> lockId
    
    This closes #10 .
---
 .../tencent/tubemq/server/common/utils/JVMClusterUtil.java |  6 +++---
 .../com/tencent/tubemq/server/common/utils/RowLock.java    | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/JVMClusterUtil.java b/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/JVMClusterUtil.java
index 6df947d..6412a58 100644
--- a/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/JVMClusterUtil.java
+++ b/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/JVMClusterUtil.java
@@ -81,7 +81,7 @@ public class JVMClusterUtil {
      * address.
      */
     public static void startup(final List<MasterThread> masters,
-                               final List<BrokerThread> regionservers) throws IOException {
+                               final List<BrokerThread> regionServers) throws IOException {
 
         if (masters == null || masters.isEmpty()) {
             return;
@@ -91,8 +91,8 @@ public class JVMClusterUtil {
             t.start();
         }
 
-        if (regionservers != null) {
-            for (JVMClusterUtil.BrokerThread t : regionservers) {
+        if (regionServers != null) {
+            for (JVMClusterUtil.BrokerThread t : regionServers) {
                 t.start();
             }
         }
diff --git a/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/RowLock.java b/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/RowLock.java
index 09445eb..ec156b0 100644
--- a/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/RowLock.java
+++ b/tubemq-server/src/main/java/com/tencent/tubemq/server/common/utils/RowLock.java
@@ -51,25 +51,25 @@ public class RowLock {
         this.name = lockName;
     }
 
-    public Integer getLock(Integer lockid, byte[] row, boolean waitForLock) throws IOException {
-        return getLock(lockid, new HashedBytes(row), waitForLock);
+    public Integer getLock(Integer lockId, byte[] row, boolean waitForLock) throws IOException {
+        return getLock(lockId, new HashedBytes(row), waitForLock);
     }
 
-    protected Integer getLock(Integer lockid,
+    protected Integer getLock(Integer lockId,
                               HashedBytes row,
                               boolean waitForLock) throws IOException {
         Integer lid;
-        if (lockid == null) {
+        if (lockId == null) {
             lid = internalObtainRowLock(row, waitForLock);
         } else {
-            HashedBytes rowFromLock = lockIds.get(lockid);
+            HashedBytes rowFromLock = lockIds.get(lockId);
             if (!row.equals(rowFromLock)) {
                 throw new IOException(new StringBuilder(512)
-                        .append("Invalid row lock: LockId: ").append(lockid)
+                        .append("Invalid row lock: LockId: ").append(lockId)
                         .append(" holds the lock for row: ").append(rowFromLock)
                         .append(" but wanted lock for row: ").append(row).toString());
             }
-            lid = lockid;
+            lid = lockId;
         }
         return lid;
     }