提交 2f46644e 编写于 作者: C chengxiangwang

reformat code to rmq_codestyle

上级 5f72d0d3
......@@ -58,6 +58,7 @@ public class WillMessage {
public void setQos(int qos) {
this.qos = qos;
}
public String getString() {
return new String(body);
}
......
......@@ -29,7 +29,7 @@ public class MqttSubscriptionData extends SubscriptionData {
}
public MqttSubscriptionData(int qos, String clientId, String topicFilter) {
super(topicFilter,null);
super(topicFilter, null);
this.qos = qos;
this.clientId = clientId;
}
......
......@@ -216,6 +216,7 @@ public class MqttRemotingServer extends NettyRemotingServerAbstract implements R
private void registerMessageHandler() {
}
@Override
public void shutdown() {
try {
......
......@@ -51,6 +51,7 @@ public final class RocketMQMqttSubAckPayload extends RemotingSerializable {
public MqttSubAckPayload toMqttSubAckPayload() throws UnsupportedEncodingException {
return new MqttSubAckPayload(this.grantedQoSLevels);
}
@Override
public String toString() {
return StringUtil.simpleClassName(this) + '[' + "grantedQoSLevels=" + this.grantedQoSLevels + ']';
......
......@@ -45,6 +45,7 @@ public final class RocketMQMqttSubscribePayload extends RemotingSerializable {
List<MqttTopicSubscription> topicSubscriptions) {
this.topicSubscriptions = topicSubscriptions;
}
public static RocketMQMqttSubscribePayload fromMqttSubscribePayload(MqttSubscribePayload payload) {
return new RocketMQMqttSubscribePayload(payload.topicSubscriptions());
}
......@@ -52,6 +53,7 @@ public final class RocketMQMqttSubscribePayload extends RemotingSerializable {
public MqttSubscribePayload toMqttSubscribePayload() throws UnsupportedEncodingException {
return new MqttSubscribePayload(this.topicSubscriptions);
}
@Override
public String toString() {
StringBuilder builder = new StringBuilder(StringUtil.simpleClassName(this)).append('[');
......
......@@ -41,6 +41,7 @@ public class RocketMQMqttUnSubscribePayload extends RemotingSerializable {
public void setTopics(List<String> topics) {
this.topics = Collections.unmodifiableList(topics);
}
public static RocketMQMqttUnSubscribePayload fromMqttUnSubscribePayload(MqttUnsubscribePayload payload) {
return new RocketMQMqttUnSubscribePayload(payload.topics());
}
......@@ -48,6 +49,7 @@ public class RocketMQMqttUnSubscribePayload extends RemotingSerializable {
public MqttUnsubscribePayload toMqttUnsubscribePayload() throws UnsupportedEncodingException {
return new MqttUnsubscribePayload(this.topics);
}
@Override
public String toString() {
StringBuilder builder = new StringBuilder(StringUtil.simpleClassName(this)).append('[');
......
......@@ -44,6 +44,6 @@ public class MqttSubackEncodeDecode implements Message2MessageEncodeDecode {
new MqttFixedHeader(MqttMessageType.SUBACK, mqttHeader.isDup(),
MqttQoS.valueOf(mqttHeader.getQosLevel()), mqttHeader.isRetain(),
mqttHeader.getRemainingLength()),
MqttMessageIdVariableHeader.from(mqttHeader.getMessageId()),new MqttSubAckPayload());
MqttMessageIdVariableHeader.from(mqttHeader.getMessageId()), new MqttSubAckPayload());
}
}
......@@ -31,22 +31,16 @@ import org.apache.rocketmq.snode.client.impl.IOTClientManagerImpl;
public class MqttDisconnectMessageHandler implements MessageHandler {
private static final InternalLogger log = InternalLoggerFactory
.getLogger(LoggerName.SNODE_LOGGER_NAME);
private static final InternalLogger log = InternalLoggerFactory.getLogger(LoggerName.SNODE_LOGGER_NAME);
private final SnodeController snodeController;
public MqttDisconnectMessageHandler(SnodeController snodeController) {
this.snodeController = snodeController;
}
/**
* handle the DISCONNECT message from the client
* <ol>
* <li>discard the Will Message and Will Topic</li>
* <li>remove the client from the IOTClientManager</li>
* <li>disconnect the connection</li>
* </ol>
* handle the DISCONNECT message from the client <ol> <li>discard the Will Message and Will Topic</li> <li>remove
* the client from the IOTClientManager</li> <li>disconnect the connection</li> </ol>
*/
@Override
public RemotingCommand handleMessage(MqttMessage message, RemotingChannel remotingChannel) {
......
......@@ -97,6 +97,7 @@ public class DefaultMqttMessageProcessorTest {
CodecHelper.makeCustomHeaderToNet(request);
return request;
}
private byte[] encode(Object obj) {
String json = JSON.toJSONString(obj, false);
if (json != null) {
......
......@@ -27,16 +27,14 @@ import java.nio.channels.FileChannel;
import java.nio.channels.OverlappingFileLockException;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.rocketmq.common.BrokerConfig;
import org.apache.rocketmq.common.UtilAll;
import org.apache.rocketmq.store.config.FlushDiskType;
import org.apache.rocketmq.store.config.MessageStoreConfig;
import org.apache.rocketmq.store.config.StorePathConfigHelper;
import org.junit.After;
import org.apache.rocketmq.store.stats.BrokerStatsManager;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
......@@ -62,7 +60,6 @@ public class DefaultMessageStoreTest {
messageStore.start();
}
@Ignore
@Test(expected = OverlappingFileLockException.class)
public void test_repate_restart() throws Exception {
QUEUE_TOTAL = 1;
......
......@@ -16,12 +16,10 @@ import org.apache.rocketmq.store.MessageExtBrokerInner;
import org.apache.rocketmq.store.PutMessageResult;
import org.apache.rocketmq.store.PutMessageStatus;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
public class DLedgerCommitlogTest extends MessageStoreTestBase {
@Ignore
@Test
public void testTruncateCQ() throws Exception {
String base = createBaseDir();
......@@ -77,7 +75,6 @@ public class DLedgerCommitlogTest extends MessageStoreTestBase {
}
@Ignore
@Test
public void testRecover() throws Exception {
String base = createBaseDir();
......@@ -118,7 +115,6 @@ public class DLedgerCommitlogTest extends MessageStoreTestBase {
}
@Ignore
@Test
public void testPutAndGetMessage() throws Exception {
String base = createBaseDir();
......@@ -159,7 +155,6 @@ public class DLedgerCommitlogTest extends MessageStoreTestBase {
messageStore.shutdown();
}
@Ignore
@Test
public void testCommittedPos() throws Exception {
String peers = String.format("n0-localhost:%d;n1-localhost:%d", nextPort(), nextPort());
......
......@@ -5,13 +5,11 @@ import org.apache.rocketmq.store.DefaultMessageStore;
import org.apache.rocketmq.store.StoreTestBase;
import org.apache.rocketmq.store.config.StorePathConfigHelper;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
public class MixCommitlogTest extends MessageStoreTestBase {
@Ignore
@Test
public void testFallBehindCQ() throws Exception {
String base = createBaseDir();
......@@ -51,7 +49,6 @@ public class MixCommitlogTest extends MessageStoreTestBase {
}
@Ignore
@Test
public void testPutAndGet() throws Exception {
String base = createBaseDir();
......@@ -112,7 +109,6 @@ public class MixCommitlogTest extends MessageStoreTestBase {
recoverDledgerStore.shutdown();
}
}
@Ignore
@Test
public void testDeleteExpiredFiles() throws Exception {
String base = createBaseDir();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册