[05/28] incubator-rocketmq git commit: [ROCKETMQ-209]Remove duplicated code in class MQClientAPIImpl

2017-08-29 Thread yukon 
[ROCKETMQ-209]Remove duplicated code in class MQClientAPIImpl

Author: Ritabrata Moitra 

Closes #134 from Ritabrata-TW/master.


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

Branch: refs/heads/master
Commit: ffad6566b8aee86b87b34f2c77ab2ae3b9c15b1c
Parents: ccc2235
Author: Ritabrata Moitra 
Authored: Fri Aug 11 19:59:28 2017 +0800
Committer: yukon 
Committed: Fri Aug 11 19:59:28 2017 +0800

--
 .../rocketmq/client/impl/MQClientAPIImpl.java   | 160 ++-
 .../rocketmq/store/DefaultMessageStore.java |  47 +++---
 .../rocketmq/store/DefaultMessageStoreTest.java |  21 +--
 3 files changed, 114 insertions(+), 114 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/ffad6566/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
--
diff --git 
a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java 
b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
index 4244bdd..ae9ed6c 100644
--- a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
@@ -18,14 +18,14 @@ package org.apache.rocketmq.client.impl;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.Iterator;
-import java.util.Collections;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.rocketmq.client.ClientConfig;
 import org.apache.rocketmq.client.consumer.PullCallback;
@@ -49,12 +49,12 @@ import org.apache.rocketmq.common.UtilAll;
 import org.apache.rocketmq.common.admin.ConsumeStats;
 import org.apache.rocketmq.common.admin.TopicStatsTable;
 import org.apache.rocketmq.common.message.Message;
+import org.apache.rocketmq.common.message.MessageBatch;
 import org.apache.rocketmq.common.message.MessageClientIDSetter;
-import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.common.message.MessageQueue;
 import org.apache.rocketmq.common.message.MessageConst;
 import org.apache.rocketmq.common.message.MessageDecoder;
-import org.apache.rocketmq.common.message.MessageBatch;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.apache.rocketmq.common.message.MessageQueue;
 import org.apache.rocketmq.common.namesrv.TopAddressing;
 import org.apache.rocketmq.common.protocol.RequestCode;
 import org.apache.rocketmq.common.protocol.ResponseCode;
@@ -152,7 +152,6 @@ import 
org.apache.rocketmq.remoting.protocol.RemotingCommand;
 import org.apache.rocketmq.remoting.protocol.RemotingSerializable;
 import org.slf4j.Logger;
 
-
 public class MQClientAPIImpl {
 
 private final static Logger log = ClientLogger.getLog();
@@ -169,7 +168,8 @@ public class MQClientAPIImpl {
 private String nameSrvAddr = null;
 private ClientConfig clientConfig;
 
-public MQClientAPIImpl(final NettyClientConfig nettyClientConfig, final 
ClientRemotingProcessor clientRemotingProcessor,
+public MQClientAPIImpl(final NettyClientConfig nettyClientConfig,
+final ClientRemotingProcessor clientRemotingProcessor,
 RPCHook rpcHook, final ClientConfig clientConfig) {
 this.clientConfig = clientConfig;
 topAddressing = new TopAddressing(MixAll.getWSAddr(), 
clientConfig.getUnitName());
@@ -233,7 +233,8 @@ public class MQClientAPIImpl {
 this.remotingClient.shutdown();
 }
 
-public void createSubscriptionGroup(final String addr, final 
SubscriptionGroupConfig config, final long timeoutMillis)
+public void createSubscriptionGroup(final String addr, final 
SubscriptionGroupConfig config,
+final long timeoutMillis)
 throws RemotingException, MQBrokerException, InterruptedException, 
MQClientException {
 RemotingCommand request = 
RemotingCommand.createRequestCommand(RequestCode.UPDATE_AND_CREATE_SUBSCRIPTIONGROUP,
 null);
 
@@ -255,7 +256,8 @@ public class MQClientAPIImpl {
 
 }
 
-public void createTopic(final String addr, final String defaultTopic, 
final TopicConfig topicConfig, final long timeoutMillis)
+public void createTopic(final String addr, final String defaultTopic, 
final TopicConfig

incubator-rocketmq git commit: [ROCKETMQ-209]Remove duplicated code in class MQClientAPIImpl

2017-08-11 Thread yukon 
Repository: incubator-rocketmq
Updated Branches:
  refs/heads/develop ccc2235ae -> ffad6566b


[ROCKETMQ-209]Remove duplicated code in class MQClientAPIImpl

Author: Ritabrata Moitra 

Closes #134 from Ritabrata-TW/master.


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

Branch: refs/heads/develop
Commit: ffad6566b8aee86b87b34f2c77ab2ae3b9c15b1c
Parents: ccc2235
Author: Ritabrata Moitra 
Authored: Fri Aug 11 19:59:28 2017 +0800
Committer: yukon 
Committed: Fri Aug 11 19:59:28 2017 +0800

--
 .../rocketmq/client/impl/MQClientAPIImpl.java   | 160 ++-
 .../rocketmq/store/DefaultMessageStore.java |  47 +++---
 .../rocketmq/store/DefaultMessageStoreTest.java |  21 +--
 3 files changed, 114 insertions(+), 114 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/ffad6566/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
--
diff --git 
a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java 
b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
index 4244bdd..ae9ed6c 100644
--- a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
@@ -18,14 +18,14 @@ package org.apache.rocketmq.client.impl;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.Iterator;
-import java.util.Collections;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.rocketmq.client.ClientConfig;
 import org.apache.rocketmq.client.consumer.PullCallback;
@@ -49,12 +49,12 @@ import org.apache.rocketmq.common.UtilAll;
 import org.apache.rocketmq.common.admin.ConsumeStats;
 import org.apache.rocketmq.common.admin.TopicStatsTable;
 import org.apache.rocketmq.common.message.Message;
+import org.apache.rocketmq.common.message.MessageBatch;
 import org.apache.rocketmq.common.message.MessageClientIDSetter;
-import org.apache.rocketmq.common.message.MessageExt;
-import org.apache.rocketmq.common.message.MessageQueue;
 import org.apache.rocketmq.common.message.MessageConst;
 import org.apache.rocketmq.common.message.MessageDecoder;
-import org.apache.rocketmq.common.message.MessageBatch;
+import org.apache.rocketmq.common.message.MessageExt;
+import org.apache.rocketmq.common.message.MessageQueue;
 import org.apache.rocketmq.common.namesrv.TopAddressing;
 import org.apache.rocketmq.common.protocol.RequestCode;
 import org.apache.rocketmq.common.protocol.ResponseCode;
@@ -152,7 +152,6 @@ import 
org.apache.rocketmq.remoting.protocol.RemotingCommand;
 import org.apache.rocketmq.remoting.protocol.RemotingSerializable;
 import org.slf4j.Logger;
 
-
 public class MQClientAPIImpl {
 
 private final static Logger log = ClientLogger.getLog();
@@ -169,7 +168,8 @@ public class MQClientAPIImpl {
 private String nameSrvAddr = null;
 private ClientConfig clientConfig;
 
-public MQClientAPIImpl(final NettyClientConfig nettyClientConfig, final 
ClientRemotingProcessor clientRemotingProcessor,
+public MQClientAPIImpl(final NettyClientConfig nettyClientConfig,
+final ClientRemotingProcessor clientRemotingProcessor,
 RPCHook rpcHook, final ClientConfig clientConfig) {
 this.clientConfig = clientConfig;
 topAddressing = new TopAddressing(MixAll.getWSAddr(), 
clientConfig.getUnitName());
@@ -233,7 +233,8 @@ public class MQClientAPIImpl {
 this.remotingClient.shutdown();
 }
 
-public void createSubscriptionGroup(final String addr, final 
SubscriptionGroupConfig config, final long timeoutMillis)
+public void createSubscriptionGroup(final String addr, final 
SubscriptionGroupConfig config,
+final long timeoutMillis)
 throws RemotingException, MQBrokerException, InterruptedException, 
MQClientException {
 RemotingCommand request = 
RemotingCommand.createRequestCommand(RequestCode.UPDATE_AND_CREATE_SUBSCRIPTIONGROUP,
 null);
 
@@ -255,7 +256,8 @@ public class MQClientAPIImpl {
 
 }
 
-public void createTopic(final String addr, final String defaultTopic, 
final TopicConfig topicConfig, final long timeoutMillis)
+