http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java ---------------------------------------------------------------------- diff --git a/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java b/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java index 2f035e0..1ae6f2f 100644 --- a/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java +++ b/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java @@ -149,13 +149,16 @@ public class DefaultMQProducerTest { final Throwable[] assertionErrors = new Throwable[1]; final CountDownLatch countDownLatch = new CountDownLatch(2); producer.getDefaultMQProducerImpl().registerSendMessageHook(new SendMessageHook() { - @Override public String hookName() { + @Override + public String hookName() { return "TestHook"; } - @Override public void sendMessageBefore(final SendMessageContext context) { + @Override + public void sendMessageBefore(final SendMessageContext context) { assertionErrors[0] = assertInOtherThread(new Runnable() { - @Override public void run() { + @Override + public void run() { assertThat(context.getMessage()).isEqualTo(message); assertThat(context.getProducer()).isEqualTo(producer); assertThat(context.getCommunicationMode()).isEqualTo(CommunicationMode.SYNC); @@ -165,9 +168,11 @@ public class DefaultMQProducerTest { countDownLatch.countDown(); } - @Override public void sendMessageAfter(final SendMessageContext context) { + @Override + public void sendMessageAfter(final SendMessageContext context) { assertionErrors[0] = assertInOtherThread(new Runnable() { - @Override public void run() { + @Override + public void run() { assertThat(context.getMessage()).isEqualTo(message); assertThat(context.getProducer()).isEqualTo(producer.getDefaultMQProducerImpl()); assertThat(context.getCommunicationMode()).isEqualTo(CommunicationMode.SYNC); @@ -229,7 +234,8 @@ public class DefaultMQProducerTest { private Throwable assertInOtherThread(final Runnable runnable) { final Throwable[] assertionErrors = new Throwable[1]; Thread thread = new Thread(new Runnable() { - @Override public void run() { + @Override + public void run() { try { runnable.run(); } catch (AssertionError e) {
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java index f22729c..9a208a3 100644 --- a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java +++ b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java @@ -54,7 +54,8 @@ public class BrokerConfig { private String messageStorePlugIn = ""; /** - * thread numbers for send message thread pool, since spin lock will be used by default since 4.0.x, the default value is 1. + * thread numbers for send message thread pool, since spin lock will be used by default since 4.0.x, the default + * value is 1. */ private int sendMessageThreadPoolNums = 1; //16 + Runtime.getRuntime().availableProcessors() * 4; private int pullMessageThreadPoolNums = 16 + Runtime.getRuntime().availableProcessors() * 2; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/Configuration.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/Configuration.java b/common/src/main/java/org/apache/rocketmq/common/Configuration.java index d0c7aef..802f6ee 100644 --- a/common/src/main/java/org/apache/rocketmq/common/Configuration.java +++ b/common/src/main/java/org/apache/rocketmq/common/Configuration.java @@ -65,7 +65,6 @@ public class Configuration { /** * register config object * - * @param configObject * @return the current Configuration object */ public Configuration registerConfig(Object configObject) { @@ -91,7 +90,6 @@ public class Configuration { /** * register config properties * - * @param extProperties * @return the current Configuration object */ public Configuration registerConfig(Properties extProperties) { @@ -117,8 +115,6 @@ public class Configuration { /** * The store path will be gotten from the field of object. * - * @param object - * @param fieldName * @throws java.lang.RuntimeException if the field of object is not exist. */ public void setStorePathFromConfig(Object object, String fieldName) { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/CountDownLatch2.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/CountDownLatch2.java b/common/src/main/java/org/apache/rocketmq/common/CountDownLatch2.java index cb39032..de1d548 100644 --- a/common/src/main/java/org/apache/rocketmq/common/CountDownLatch2.java +++ b/common/src/main/java/org/apache/rocketmq/common/CountDownLatch2.java @@ -29,7 +29,8 @@ public class CountDownLatch2 { /** * Constructs a {@code CountDownLatch2} initialized with the given count. * - * @param count the number of times {@link #countDown} must be invoked before threads can pass through {@link #await} + * @param count the number of times {@link #countDown} must be invoked before threads can pass through {@link + * #await} * @throws IllegalArgumentException if {@code count} is negative */ public CountDownLatch2(int count) { @@ -104,7 +105,8 @@ public class CountDownLatch2 { * * @param timeout the maximum time to wait * @param unit the time unit of the {@code timeout} argument - * @return {@code true} if the count reached zero and {@code false} if the waiting time elapsed before the count reached zero + * @return {@code true} if the count reached zero and {@code false} if the waiting time elapsed before the count + * reached zero * @throws InterruptedException if the current thread is interrupted while waiting */ public boolean await(long timeout, TimeUnit unit) @@ -176,7 +178,7 @@ public class CountDownLatch2 { protected boolean tryReleaseShared(int releases) { // Decrement count; signal when transition to zero - for (;;) { + for (; ; ) { int c = getState(); if (c == 0) return false; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/DataVersion.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/DataVersion.java b/common/src/main/java/org/apache/rocketmq/common/DataVersion.java index e47a9b3..71b00fd 100644 --- a/common/src/main/java/org/apache/rocketmq/common/DataVersion.java +++ b/common/src/main/java/org/apache/rocketmq/common/DataVersion.java @@ -74,7 +74,7 @@ public class DataVersion extends RemotingSerializable { int result = (int) (timestamp ^ (timestamp >>> 32)); if (null != counter) { long l = counter.get(); - result = 31 * result + (int)(l ^ (l >>> 32)); + result = 31 * result + (int) (l ^ (l >>> 32)); } return result; } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/MixAll.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/MixAll.java b/common/src/main/java/org/apache/rocketmq/common/MixAll.java index f8e9b4e..d72681f 100644 --- a/common/src/main/java/org/apache/rocketmq/common/MixAll.java +++ b/common/src/main/java/org/apache/rocketmq/common/MixAll.java @@ -58,8 +58,8 @@ public class MixAll { public static final String DEFAULT_NAMESRV_ADDR_LOOKUP = "jmenv.tbsite.net"; public static final String WS_DOMAIN_NAME = System.getProperty("rocketmq.namesrv.domain", DEFAULT_NAMESRV_ADDR_LOOKUP); public static final String WS_DOMAIN_SUBGROUP = System.getProperty("rocketmq.namesrv.domain.subgroup", "nsaddr"); -// // http://jmenv.tbsite.net:8080/rocketmq/nsaddr -// public static final String WS_ADDR = "http://" + WS_DOMAIN_NAME + ":8080/rocketmq/" + WS_DOMAIN_SUBGROUP; + //http://jmenv.tbsite.net:8080/rocketmq/nsaddr + //public static final String WS_ADDR = "http://" + WS_DOMAIN_NAME + ":8080/rocketmq/" + WS_DOMAIN_SUBGROUP; public static final String DEFAULT_TOPIC = "TBW102"; public static final String BENCHMARK_TOPIC = "BenchmarkTest"; public static final String DEFAULT_PRODUCER_GROUP = "DEFAULT_PRODUCER"; @@ -169,7 +169,6 @@ public class MixAll { file.renameTo(new File(fileName)); } - public static void string2FileNotSafe(final String str, final String fileName) throws IOException { File file = new File(fileName); File fileParent = file.getParentFile(); @@ -250,7 +249,8 @@ public class MixAll { printObjectProperties(logger, object, false); } - public static void printObjectProperties(final Logger logger, final Object object, final boolean onlyImportantField) { + public static void printObjectProperties(final Logger logger, final Object object, + final boolean onlyImportantField) { Field[] fields = object.getClass().getDeclaredFields(); for (Field field : fields) { if (!Modifier.isStatic(field.getModifiers())) { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/ServiceThread.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/ServiceThread.java b/common/src/main/java/org/apache/rocketmq/common/ServiceThread.java index 7b96880..bf7e724 100644 --- a/common/src/main/java/org/apache/rocketmq/common/ServiceThread.java +++ b/common/src/main/java/org/apache/rocketmq/common/ServiceThread.java @@ -65,7 +65,7 @@ public abstract class ServiceThread implements Runnable { } long eclipseTime = System.currentTimeMillis() - beginTime; log.info("join thread " + this.getServiceName() + " eclipse time(ms) " + eclipseTime + " " - + this.getJointime()); + + this.getJointime()); } catch (InterruptedException e) { log.error("Interrupted", e); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/UtilAll.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/UtilAll.java b/common/src/main/java/org/apache/rocketmq/common/UtilAll.java index 5f5a339..9ed8ab8 100644 --- a/common/src/main/java/org/apache/rocketmq/common/UtilAll.java +++ b/common/src/main/java/org/apache/rocketmq/common/UtilAll.java @@ -209,7 +209,6 @@ public class UtilAll { return -1; } - public static int crc32(byte[] array) { if (array != null) { return crc32(array, 0, array.length); @@ -218,7 +217,6 @@ public class UtilAll { return 0; } - public static int crc32(byte[] array, int offset, int length) { CRC32 crc32 = new CRC32(); crc32.update(array, offset, length); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/consistenthash/ConsistentHashRouter.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/consistenthash/ConsistentHashRouter.java b/common/src/main/java/org/apache/rocketmq/common/consistenthash/ConsistentHashRouter.java index a6fce51..fca1d87 100644 --- a/common/src/main/java/org/apache/rocketmq/common/consistenthash/ConsistentHashRouter.java +++ b/common/src/main/java/org/apache/rocketmq/common/consistenthash/ConsistentHashRouter.java @@ -25,20 +25,18 @@ import java.util.TreeMap; /** * To hash Node objects to a hash ring with a certain amount of virtual node. - * Method routeNode will return a Node instance which the object key should be allocated to according to consistent hash algorithm - * - * @param <T> + * Method routeNode will return a Node instance which the object key should be allocated to according to consistent hash + * algorithm */ public class ConsistentHashRouter<T extends Node> { private final SortedMap<Long, VirtualNode<T>> ring = new TreeMap<Long, VirtualNode<T>>(); private final HashFunction hashFunction; public ConsistentHashRouter(Collection<T> pNodes, int vNodeCount) { - this(pNodes,vNodeCount, new MD5Hash()); + this(pNodes, vNodeCount, new MD5Hash()); } /** - * * @param pNodes collections of physical nodes * @param vNodeCount amounts of virtual nodes * @param hashFunction hash Function to hash Node instances @@ -57,11 +55,13 @@ public class ConsistentHashRouter<T extends Node> { /** * add physic node to the hash ring with some virtual nodes + * * @param pNode physical node needs added to hash ring * @param vNodeCount the number of virtual node of the physical node. Value should be greater than or equals to 0 */ public void addNode(T pNode, int vNodeCount) { - if (vNodeCount < 0) throw new IllegalArgumentException("illegal virtual node counts :" + vNodeCount); + if (vNodeCount < 0) + throw new IllegalArgumentException("illegal virtual node counts :" + vNodeCount); int existingReplicas = getExistingReplicas(pNode); for (int i = 0; i < vNodeCount; i++) { VirtualNode<T> vNode = new VirtualNode<T>(pNode, i + existingReplicas); @@ -71,7 +71,6 @@ public class ConsistentHashRouter<T extends Node> { /** * remove the physical node from the hash ring - * @param pNode */ public void removeNode(T pNode) { Iterator<Long> it = ring.keySet().iterator(); @@ -86,20 +85,19 @@ public class ConsistentHashRouter<T extends Node> { /** * with a specified key, route the nearest Node instance in the current hash ring + * * @param objectKey the object key to find a nearest Node - * @return */ public T routeNode(String objectKey) { if (ring.isEmpty()) { return null; } Long hashVal = hashFunction.hash(objectKey); - SortedMap<Long,VirtualNode<T>> tailMap = ring.tailMap(hashVal); + SortedMap<Long, VirtualNode<T>> tailMap = ring.tailMap(hashVal); Long nodeHashVal = !tailMap.isEmpty() ? tailMap.firstKey() : ring.firstKey(); return ring.get(nodeHashVal).getPhysicalNode(); } - public int getExistingReplicas(T pNode) { int replicas = 0; for (VirtualNode<T> vNode : ring.values()) { @@ -110,7 +108,6 @@ public class ConsistentHashRouter<T extends Node> { return replicas; } - //default hash function private static class MD5Hash implements HashFunction { MessageDigest instance; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/consistenthash/Node.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/consistenthash/Node.java b/common/src/main/java/org/apache/rocketmq/common/consistenthash/Node.java index 0ece210..192600b 100644 --- a/common/src/main/java/org/apache/rocketmq/common/consistenthash/Node.java +++ b/common/src/main/java/org/apache/rocketmq/common/consistenthash/Node.java @@ -21,7 +21,6 @@ package org.apache.rocketmq.common.consistenthash; */ public interface Node { /** - * * @return the key which will be used for hash mapping */ String getKey(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/consistenthash/VirtualNode.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/consistenthash/VirtualNode.java b/common/src/main/java/org/apache/rocketmq/common/consistenthash/VirtualNode.java index c8b72d9..c086c01 100644 --- a/common/src/main/java/org/apache/rocketmq/common/consistenthash/VirtualNode.java +++ b/common/src/main/java/org/apache/rocketmq/common/consistenthash/VirtualNode.java @@ -16,7 +16,6 @@ */ package org.apache.rocketmq.common.consistenthash; - public class VirtualNode<T extends Node> implements Node { final T physicalNode; final int replicaIndex; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/filter/FilterAPI.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/filter/FilterAPI.java b/common/src/main/java/org/apache/rocketmq/common/filter/FilterAPI.java index fc8525c..9268a6e 100644 --- a/common/src/main/java/org/apache/rocketmq/common/filter/FilterAPI.java +++ b/common/src/main/java/org/apache/rocketmq/common/filter/FilterAPI.java @@ -65,7 +65,7 @@ public class FilterAPI { } public static SubscriptionData build(final String topic, final String subString, - final String type) throws Exception { + final String type) throws Exception { if (ExpressionType.TAG.equals(type) || type == null) { return buildSubscriptionData(null, topic, subString); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/filter/impl/PolishExpr.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/filter/impl/PolishExpr.java b/common/src/main/java/org/apache/rocketmq/common/filter/impl/PolishExpr.java index 56e94e4..cdc6187 100644 --- a/common/src/main/java/org/apache/rocketmq/common/filter/impl/PolishExpr.java +++ b/common/src/main/java/org/apache/rocketmq/common/filter/impl/PolishExpr.java @@ -35,7 +35,6 @@ public class PolishExpr { * Shunting-yard algorithm <br/> * http://en.wikipedia.org/wiki/Shunting_yard_algorithm * - * @param tokens * @return the compute result of Shunting-yard algorithm */ public static List<Op> reversePolish(List<Op> tokens) { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/message/MessageDecoder.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/message/MessageDecoder.java b/common/src/main/java/org/apache/rocketmq/common/message/MessageDecoder.java index e41ec9d..2d7bcbb 100644 --- a/common/src/main/java/org/apache/rocketmq/common/message/MessageDecoder.java +++ b/common/src/main/java/org/apache/rocketmq/common/message/MessageDecoder.java @@ -98,7 +98,6 @@ public class MessageDecoder { * Just decode properties from msg buffer. * * @param byteBuffer msg commit log buffer. - * @return */ public static Map<String, String> decodeProperties(java.nio.ByteBuffer byteBuffer) { int topicLengthPosition = BODY_SIZE_POSITION + 4 + byteBuffer.getInt(BODY_SIZE_POSITION); @@ -239,8 +238,6 @@ public class MessageDecoder { return byteBuffer.array(); } - - public static MessageExt decode( java.nio.ByteBuffer byteBuffer, final boolean readBody, final boolean deCompressBody) { return decode(byteBuffer, readBody, deCompressBody, false); @@ -414,7 +411,6 @@ public class MessageDecoder { return map; } - public static byte[] encodeMessage(Message message) { //only need flag, body, properties byte[] body = message.getBody(); @@ -488,9 +484,9 @@ public class MessageDecoder { public static byte[] encodeMessages(List<Message> messages) { //TO DO refactor, accumulate in one buffer, avoid copies - List<byte[]> encodedMessages = new ArrayList<byte[]>(messages.size()); + List<byte[]> encodedMessages = new ArrayList<byte[]>(messages.size()); int allSize = 0; - for (Message message: messages) { + for (Message message : messages) { byte[] tmp = encodeMessage(message); encodedMessages.add(tmp); allSize += tmp.length; @@ -504,7 +500,6 @@ public class MessageDecoder { return allBytes; } - public static List<Message> decodeMessages(ByteBuffer byteBuffer) throws Exception { //TO DO add a callback for processing, avoid creating lists List<Message> msgs = new ArrayList<Message>(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/message/MessageExtBatch.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/message/MessageExtBatch.java b/common/src/main/java/org/apache/rocketmq/common/message/MessageExtBatch.java index 352ab37..a2713cb 100644 --- a/common/src/main/java/org/apache/rocketmq/common/message/MessageExtBatch.java +++ b/common/src/main/java/org/apache/rocketmq/common/message/MessageExtBatch.java @@ -6,13 +6,13 @@ * (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 + * 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. + * 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.rocketmq.common.message; @@ -23,13 +23,11 @@ public class MessageExtBatch extends MessageExt { private static final long serialVersionUID = -2353110995348498537L; - public ByteBuffer wrap() { assert getBody() != null; - return ByteBuffer.wrap(getBody(), 0, getBody().length); + return ByteBuffer.wrap(getBody(), 0, getBody().length); } - private ByteBuffer encodedBuff; public ByteBuffer getEncodedBuff() { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/protocol/RequestCode.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/RequestCode.java b/common/src/main/java/org/apache/rocketmq/common/protocol/RequestCode.java index 6f132f7..5900c0b 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/RequestCode.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/RequestCode.java @@ -162,7 +162,6 @@ public class RequestCode { */ public static final int GET_NAMESRV_CONFIG = 319; - public static final int SEND_BATCH_MESSAGE = 320; public static final int QUERY_CONSUME_QUEUE = 321; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/protocol/header/SearchOffsetRequestHeader.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/SearchOffsetRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/SearchOffsetRequestHeader.java index 3685ef9..5ea2e24 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/SearchOffsetRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/SearchOffsetRequestHeader.java @@ -35,7 +35,6 @@ public class SearchOffsetRequestHeader implements CommandCustomHeader { @Override public void checkFields() throws RemotingCommandException { - } public String getTopic() { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java index 757ef0c..4e0098b 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/SendMessageRequestHeaderV2.java @@ -54,7 +54,6 @@ public class SendMessageRequestHeaderV2 implements CommandCustomHeader { @CFNullable private boolean m; //batch - public static SendMessageRequestHeader createSendMessageRequestHeaderV1(final SendMessageRequestHeaderV2 v2) { SendMessageRequestHeader v1 = new SendMessageRequestHeader(); v1.setProducerGroup(v2.a); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/protocol/header/UnregisterClientRequestHeader.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/UnregisterClientRequestHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/UnregisterClientRequestHeader.java index 95e18d0..bb0a462 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/UnregisterClientRequestHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/UnregisterClientRequestHeader.java @@ -58,6 +58,5 @@ public class UnregisterClientRequestHeader implements CommandCustomHeader { @Override public void checkFields() throws RemotingCommandException { - } } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/protocol/header/UnregisterClientResponseHeader.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/header/UnregisterClientResponseHeader.java b/common/src/main/java/org/apache/rocketmq/common/protocol/header/UnregisterClientResponseHeader.java index f61f0cd..38fb87a 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/header/UnregisterClientResponseHeader.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/header/UnregisterClientResponseHeader.java @@ -25,7 +25,6 @@ public class UnregisterClientResponseHeader implements CommandCustomHeader { @Override public void checkFields() throws RemotingCommandException { - } } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/protocol/heartbeat/MessageModel.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/heartbeat/MessageModel.java b/common/src/main/java/org/apache/rocketmq/common/protocol/heartbeat/MessageModel.java index ff94bb4..defe676 100644 --- a/common/src/main/java/org/apache/rocketmq/common/protocol/heartbeat/MessageModel.java +++ b/common/src/main/java/org/apache/rocketmq/common/protocol/heartbeat/MessageModel.java @@ -22,7 +22,6 @@ package org.apache.rocketmq.common.protocol.heartbeat; /** * Message model - * */ public enum MessageModel { /** http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/sysflag/TopicSysFlag.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/sysflag/TopicSysFlag.java b/common/src/main/java/org/apache/rocketmq/common/sysflag/TopicSysFlag.java index 8fd8628..cc23ff1 100644 --- a/common/src/main/java/org/apache/rocketmq/common/sysflag/TopicSysFlag.java +++ b/common/src/main/java/org/apache/rocketmq/common/sysflag/TopicSysFlag.java @@ -16,7 +16,6 @@ */ package org.apache.rocketmq.common.sysflag; - public class TopicSysFlag { private final static int FLAG_UNIT = 0x1 << 0; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/utils/HttpTinyClient.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/utils/HttpTinyClient.java b/common/src/main/java/org/apache/rocketmq/common/utils/HttpTinyClient.java index 37bf999..85afc0a 100755 --- a/common/src/main/java/org/apache/rocketmq/common/utils/HttpTinyClient.java +++ b/common/src/main/java/org/apache/rocketmq/common/utils/HttpTinyClient.java @@ -90,13 +90,7 @@ public class HttpTinyClient { } /** - * @param url - * @param headers - * @param paramValues - * @param encoding - * @param readTimeoutMs * @return the http response of given http post request - * @throws java.io.IOException */ static public HttpResult httpPost(String url, List<String> headers, List<String> paramValues, String encoding, long readTimeoutMs) throws IOException { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/main/java/org/apache/rocketmq/common/utils/IOTinyUtils.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/rocketmq/common/utils/IOTinyUtils.java b/common/src/main/java/org/apache/rocketmq/common/utils/IOTinyUtils.java index e43ae41..5ed82ae 100644 --- a/common/src/main/java/org/apache/rocketmq/common/utils/IOTinyUtils.java +++ b/common/src/main/java/org/apache/rocketmq/common/utils/IOTinyUtils.java @@ -60,7 +60,7 @@ public class IOTinyUtils { BufferedReader reader = toBufferedReader(input); List<String> list = new ArrayList<String>(); String line; - for (;;) { + for (; ; ) { line = reader.readLine(); if (null != line) { list.add(line); @@ -114,7 +114,6 @@ public class IOTinyUtils { fileOrDir.delete(); } - public static void cleanDirectory(File directory) throws IOException { if (!directory.exists()) { String message = directory + " does not exist"; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/test/java/org/apache/rocketmq/common/MQVersionTest.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/rocketmq/common/MQVersionTest.java b/common/src/test/java/org/apache/rocketmq/common/MQVersionTest.java index ac6269f..51856b8 100644 --- a/common/src/test/java/org/apache/rocketmq/common/MQVersionTest.java +++ b/common/src/test/java/org/apache/rocketmq/common/MQVersionTest.java @@ -18,6 +18,7 @@ package org.apache.rocketmq.common; import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; public class MQVersionTest { @@ -39,7 +40,6 @@ public class MQVersionTest { assertThat(MQVersion.value2Version(0)).isEqualTo(MQVersion.Version.V3_0_0_SNAPSHOT); } - @Test public void testValue2Version_HigherVersion() throws Exception { assertThat(MQVersion.value2Version(Integer.MAX_VALUE)).isEqualTo(MQVersion.Version.HIGHER_VERSION); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/test/java/org/apache/rocketmq/common/MessageBatchTest.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/rocketmq/common/MessageBatchTest.java b/common/src/test/java/org/apache/rocketmq/common/MessageBatchTest.java index 1e406d2..f264420 100644 --- a/common/src/test/java/org/apache/rocketmq/common/MessageBatchTest.java +++ b/common/src/test/java/org/apache/rocketmq/common/MessageBatchTest.java @@ -25,7 +25,6 @@ import org.junit.Test; public class MessageBatchTest { - public List<Message> generateMessages() { List<Message> messages = new ArrayList<Message>(); Message message1 = new Message("topic1", "body".getBytes()); @@ -37,32 +36,34 @@ public class MessageBatchTest { } @Test - public void testGenerate_OK() throws Exception{ + public void testGenerate_OK() throws Exception { List<Message> messages = generateMessages(); MessageBatch.generateFromList(messages); } @Test(expected = UnsupportedOperationException.class) - public void testGenerate_DiffTopic() throws Exception{ + public void testGenerate_DiffTopic() throws Exception { List<Message> messages = generateMessages(); messages.get(1).setTopic("topic2"); MessageBatch.generateFromList(messages); } @Test(expected = UnsupportedOperationException.class) - public void testGenerate_DiffWaitOK() throws Exception{ + public void testGenerate_DiffWaitOK() throws Exception { List<Message> messages = generateMessages(); messages.get(1).setWaitStoreMsgOK(false); MessageBatch.generateFromList(messages); } + @Test(expected = UnsupportedOperationException.class) - public void testGenerate_Delay() throws Exception{ + public void testGenerate_Delay() throws Exception { List<Message> messages = generateMessages(); messages.get(1).setDelayTimeLevel(1); MessageBatch.generateFromList(messages); } + @Test(expected = UnsupportedOperationException.class) - public void testGenerate_Retry() throws Exception{ + public void testGenerate_Retry() throws Exception { List<Message> messages = generateMessages(); messages.get(1).setTopic(MixAll.RETRY_GROUP_TOPIC_PREFIX + "topic"); MessageBatch.generateFromList(messages); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/common/src/test/java/org/apache/rocketmq/common/filter/FilterAPITest.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/rocketmq/common/filter/FilterAPITest.java b/common/src/test/java/org/apache/rocketmq/common/filter/FilterAPITest.java index c5f8460..81ed971 100644 --- a/common/src/test/java/org/apache/rocketmq/common/filter/FilterAPITest.java +++ b/common/src/test/java/org/apache/rocketmq/common/filter/FilterAPITest.java @@ -35,7 +35,7 @@ public class FilterAPITest { FilterAPI.buildSubscriptionData(group, topic, subString); assertThat(subscriptionData.getTopic()).isEqualTo(topic); assertThat(subscriptionData.getSubString()).isEqualTo(subString); - String [] tags = subString.split("\\|\\|"); + String[] tags = subString.split("\\|\\|"); Set<String> tagSet = new HashSet<String>(); for (String tag : tags) { tagSet.add(tag.trim()); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/bin/mqadmin.xml ---------------------------------------------------------------------- diff --git a/distribution/bin/mqadmin.xml b/distribution/bin/mqadmin.xml index d014743..0f07da4 100644 --- a/distribution/bin/mqadmin.xml +++ b/distribution/bin/mqadmin.xml @@ -16,28 +16,28 @@ --> <java> - <debug>false</debug> + <debug>false</debug> - <javahome>${JAVA_HOME}</javahome> + <javahome>${JAVA_HOME}</javahome> - <jvmtype>server</jvmtype> + <jvmtype>server</jvmtype> - <mainclass>org.apache.rocketmq.tools.command.MQAdminStartup</mainclass> + <mainclass>org.apache.rocketmq.tools.command.MQAdminStartup</mainclass> - <properties> - <java.ext.dirs>${cpd}/../lib</java.ext.dirs> - <rocketmq.home.dir>${cpd}/..</rocketmq.home.dir> - </properties> + <properties> + <java.ext.dirs>${cpd}/../lib</java.ext.dirs> + <rocketmq.home.dir>${cpd}/..</rocketmq.home.dir> + </properties> - <classpaths> - </classpaths> + <classpaths> + </classpaths> - <options> - <-Xms512m></-Xms512m> - <-Xmx1g></-Xmx1g> - <-XX:NewSize>256M</-XX:NewSize> - <-XX:MaxNewSize>512M</-XX:MaxNewSize> - <-XX:PermSize>128M</-XX:PermSize> - <-XX:MaxPermSize>128M</-XX:MaxPermSize> - </options> + <options> + <-Xms512m></-Xms512m> + <-Xmx1g></-Xmx1g> + <-XX:NewSize>256M</-XX:NewSize> + <-XX:MaxNewSize>512M</-XX:MaxNewSize> + <-XX:PermSize>128M</-XX:PermSize> + <-XX:MaxPermSize>128M</-XX:MaxPermSize> + </options> </java> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/bin/mqbroker.xml ---------------------------------------------------------------------- diff --git a/distribution/bin/mqbroker.xml b/distribution/bin/mqbroker.xml index d1bc16f..3043cc0 100644 --- a/distribution/bin/mqbroker.xml +++ b/distribution/bin/mqbroker.xml @@ -16,28 +16,30 @@ --> <java> - <debug>false</debug> + <debug>false</debug> - <javahome>${JAVA_HOME}</javahome> + <javahome>${JAVA_HOME}</javahome> - <jvmtype>server</jvmtype> + <jvmtype>server</jvmtype> - <mainclass>org.apache.rocketmq.broker.BrokerStartup</mainclass> + <mainclass>org.apache.rocketmq.broker.BrokerStartup</mainclass> - <properties> - <java.ext.dirs>${cpd}/../lib</java.ext.dirs> - <rocketmq.home.dir>${cpd}/..</rocketmq.home.dir> - </properties> + <properties> + <java.ext.dirs>${cpd}/../lib</java.ext.dirs> + <rocketmq.home.dir>${cpd}/..</rocketmq.home.dir> + </properties> - <classpaths> - </classpaths> + <classpaths> + </classpaths> - <options> - <-Xms512m></-Xms512m> - <-Xmx1g></-Xmx1g> - <-XX:NewSize>256M</-XX:NewSize> - <-XX:MaxNewSize>512M</-XX:MaxNewSize> - <-XX:PermSize>128M</-XX:PermSize> - <-XX:MaxPermSize>128M</-XX:MaxPermSize> - </options> -</java> + <options> + <-Xms512m> + </-Xms512m> + <-Xmx1g> +</-Xmx1g> +<-XX:NewSize>256M</-XX:NewSize> +<-XX:MaxNewSize>512M</-XX:MaxNewSize> +<-XX:PermSize>128M</-XX:PermSize> +<-XX:MaxPermSize>128M</-XX:MaxPermSize> + </options> + </java> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/bin/mqfiltersrv.xml ---------------------------------------------------------------------- diff --git a/distribution/bin/mqfiltersrv.xml b/distribution/bin/mqfiltersrv.xml index 8fdea39..dc36a8d 100644 --- a/distribution/bin/mqfiltersrv.xml +++ b/distribution/bin/mqfiltersrv.xml @@ -16,28 +16,30 @@ --> <java> - <debug>false</debug> + <debug>false</debug> - <javahome>${JAVA_HOME}</javahome> + <javahome>${JAVA_HOME}</javahome> - <jvmtype>server</jvmtype> + <jvmtype>server</jvmtype> - <mainclass>org.apache.rocketmq.filtersrv.FiltersrvStartup</mainclass> + <mainclass>org.apache.rocketmq.filtersrv.FiltersrvStartup</mainclass> - <properties> - <java.ext.dirs>${cpd}/../lib</java.ext.dirs> - <rocketmq.home.dir>${cpd}/..</rocketmq.home.dir> - </properties> + <properties> + <java.ext.dirs>${cpd}/../lib</java.ext.dirs> + <rocketmq.home.dir>${cpd}/..</rocketmq.home.dir> + </properties> - <classpaths> - </classpaths> + <classpaths> + </classpaths> - <options> - <-Xms512m></-Xms512m> - <-Xmx1g></-Xmx1g> - <-XX:NewSize>256M</-XX:NewSize> - <-XX:MaxNewSize>512M</-XX:MaxNewSize> - <-XX:PermSize>128M</-XX:PermSize> - <-XX:MaxPermSize>128M</-XX:MaxPermSize> - </options> -</java> + <options> + <-Xms512m> + </-Xms512m> + <-Xmx1g> +</-Xmx1g> +<-XX:NewSize>256M</-XX:NewSize> +<-XX:MaxNewSize>512M</-XX:MaxNewSize> +<-XX:PermSize>128M</-XX:PermSize> +<-XX:MaxPermSize>128M</-XX:MaxPermSize> + </options> + </java> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/bin/mqnamesrv.xml ---------------------------------------------------------------------- diff --git a/distribution/bin/mqnamesrv.xml b/distribution/bin/mqnamesrv.xml index dc5736a..1f050d1 100644 --- a/distribution/bin/mqnamesrv.xml +++ b/distribution/bin/mqnamesrv.xml @@ -16,28 +16,30 @@ --> <java> - <debug>false</debug> + <debug>false</debug> - <javahome>${JAVA_HOME}</javahome> + <javahome>${JAVA_HOME}</javahome> - <jvmtype>server</jvmtype> + <jvmtype>server</jvmtype> - <mainclass>org.apache.rocketmq.namesrv.NamesrvStartup</mainclass> + <mainclass>org.apache.rocketmq.namesrv.NamesrvStartup</mainclass> - <properties> - <java.ext.dirs>${cpd}/../lib</java.ext.dirs> - <rocketmq.home.dir>${cpd}/..</rocketmq.home.dir> - </properties> + <properties> + <java.ext.dirs>${cpd}/../lib</java.ext.dirs> + <rocketmq.home.dir>${cpd}/..</rocketmq.home.dir> + </properties> - <classpaths> - </classpaths> + <classpaths> + </classpaths> - <options> - <-Xms512m></-Xms512m> - <-Xmx1g></-Xmx1g> - <-XX:NewSize>256M</-XX:NewSize> - <-XX:MaxNewSize>512M</-XX:MaxNewSize> - <-XX:PermSize>128M</-XX:PermSize> - <-XX:MaxPermSize>128M</-XX:MaxPermSize> - </options> -</java> + <options> + <-Xms512m> + </-Xms512m> + <-Xmx1g> +</-Xmx1g> +<-XX:NewSize>256M</-XX:NewSize> +<-XX:MaxNewSize>512M</-XX:MaxNewSize> +<-XX:PermSize>128M</-XX:PermSize> +<-XX:MaxPermSize>128M</-XX:MaxPermSize> + </options> + </java> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/conf/2m-2s-async/broker-a-s.properties ---------------------------------------------------------------------- diff --git a/distribution/conf/2m-2s-async/broker-a-s.properties b/distribution/conf/2m-2s-async/broker-a-s.properties index 10d1555..0e3388b 100644 --- a/distribution/conf/2m-2s-async/broker-a-s.properties +++ b/distribution/conf/2m-2s-async/broker-a-s.properties @@ -12,7 +12,6 @@ # 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. - brokerClusterName=DefaultCluster brokerName=broker-a brokerId=1 http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/conf/2m-2s-async/broker-a.properties ---------------------------------------------------------------------- diff --git a/distribution/conf/2m-2s-async/broker-a.properties b/distribution/conf/2m-2s-async/broker-a.properties index da6fc5f..b704b54 100644 --- a/distribution/conf/2m-2s-async/broker-a.properties +++ b/distribution/conf/2m-2s-async/broker-a.properties @@ -12,7 +12,6 @@ # 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. - brokerClusterName=DefaultCluster brokerName=broker-a brokerId=0 http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/conf/2m-2s-async/broker-b-s.properties ---------------------------------------------------------------------- diff --git a/distribution/conf/2m-2s-async/broker-b-s.properties b/distribution/conf/2m-2s-async/broker-b-s.properties index 9fbe088..6c6beab 100644 --- a/distribution/conf/2m-2s-async/broker-b-s.properties +++ b/distribution/conf/2m-2s-async/broker-b-s.properties @@ -12,7 +12,6 @@ # 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. - brokerClusterName=DefaultCluster brokerName=broker-b brokerId=1 http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/conf/2m-2s-async/broker-b.properties ---------------------------------------------------------------------- diff --git a/distribution/conf/2m-2s-async/broker-b.properties b/distribution/conf/2m-2s-async/broker-b.properties index cb09f9d..130671a 100644 --- a/distribution/conf/2m-2s-async/broker-b.properties +++ b/distribution/conf/2m-2s-async/broker-b.properties @@ -12,7 +12,6 @@ # 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. - brokerClusterName=DefaultCluster brokerName=broker-b brokerId=0 http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/conf/2m-2s-sync/broker-a-s.properties ---------------------------------------------------------------------- diff --git a/distribution/conf/2m-2s-sync/broker-a-s.properties b/distribution/conf/2m-2s-sync/broker-a-s.properties index 10d1555..0e3388b 100644 --- a/distribution/conf/2m-2s-sync/broker-a-s.properties +++ b/distribution/conf/2m-2s-sync/broker-a-s.properties @@ -12,7 +12,6 @@ # 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. - brokerClusterName=DefaultCluster brokerName=broker-a brokerId=1 http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/conf/2m-2s-sync/broker-a.properties ---------------------------------------------------------------------- diff --git a/distribution/conf/2m-2s-sync/broker-a.properties b/distribution/conf/2m-2s-sync/broker-a.properties index 82c4631..fba30fa 100644 --- a/distribution/conf/2m-2s-sync/broker-a.properties +++ b/distribution/conf/2m-2s-sync/broker-a.properties @@ -12,7 +12,6 @@ # 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. - brokerClusterName=DefaultCluster brokerName=broker-a brokerId=0 http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/conf/2m-2s-sync/broker-b-s.properties ---------------------------------------------------------------------- diff --git a/distribution/conf/2m-2s-sync/broker-b-s.properties b/distribution/conf/2m-2s-sync/broker-b-s.properties index 9fbe088..6c6beab 100644 --- a/distribution/conf/2m-2s-sync/broker-b-s.properties +++ b/distribution/conf/2m-2s-sync/broker-b-s.properties @@ -12,7 +12,6 @@ # 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. - brokerClusterName=DefaultCluster brokerName=broker-b brokerId=1 http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/conf/2m-2s-sync/broker-b.properties ---------------------------------------------------------------------- diff --git a/distribution/conf/2m-2s-sync/broker-b.properties b/distribution/conf/2m-2s-sync/broker-b.properties index 29a4264..ab925a8 100644 --- a/distribution/conf/2m-2s-sync/broker-b.properties +++ b/distribution/conf/2m-2s-sync/broker-b.properties @@ -12,7 +12,6 @@ # 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. - brokerClusterName=DefaultCluster brokerName=broker-b brokerId=0 http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/conf/2m-noslave/broker-a.properties ---------------------------------------------------------------------- diff --git a/distribution/conf/2m-noslave/broker-a.properties b/distribution/conf/2m-noslave/broker-a.properties index da6fc5f..b704b54 100644 --- a/distribution/conf/2m-noslave/broker-a.properties +++ b/distribution/conf/2m-noslave/broker-a.properties @@ -12,7 +12,6 @@ # 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. - brokerClusterName=DefaultCluster brokerName=broker-a brokerId=0 http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/conf/2m-noslave/broker-b.properties ---------------------------------------------------------------------- diff --git a/distribution/conf/2m-noslave/broker-b.properties b/distribution/conf/2m-noslave/broker-b.properties index cb09f9d..130671a 100644 --- a/distribution/conf/2m-noslave/broker-b.properties +++ b/distribution/conf/2m-noslave/broker-b.properties @@ -12,7 +12,6 @@ # 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. - brokerClusterName=DefaultCluster brokerName=broker-b brokerId=0 http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/distribution/conf/logback_broker.xml ---------------------------------------------------------------------- diff --git a/distribution/conf/logback_broker.xml b/distribution/conf/logback_broker.xml index 3945fac..56c9ac6 100644 --- a/distribution/conf/logback_broker.xml +++ b/distribution/conf/logback_broker.xml @@ -233,7 +233,7 @@ <maxIndex>10</maxIndex> </rollingPolicy> <triggeringPolicy - class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> + class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>100MB</maxFileSize> </triggeringPolicy> <encoder> @@ -350,8 +350,8 @@ </logger> <logger name="RocketmqConsole" additivity="false"> - <level value="INFO" /> - <appender-ref ref="STDOUT" /> + <level value="INFO"/> + <appender-ref ref="STDOUT"/> </logger> <root> http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/example/src/main/java/org/apache/rocketmq/example/batch/SimpleBatchProducer.java ---------------------------------------------------------------------- diff --git a/example/src/main/java/org/apache/rocketmq/example/batch/SimpleBatchProducer.java b/example/src/main/java/org/apache/rocketmq/example/batch/SimpleBatchProducer.java index a8609e7..cf566aa 100644 --- a/example/src/main/java/org/apache/rocketmq/example/batch/SimpleBatchProducer.java +++ b/example/src/main/java/org/apache/rocketmq/example/batch/SimpleBatchProducer.java @@ -24,8 +24,7 @@ import org.apache.rocketmq.common.message.Message; public class SimpleBatchProducer { - - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { DefaultMQProducer producer = new DefaultMQProducer("BatchProducerGroupName"); producer.start(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/example/src/main/java/org/apache/rocketmq/example/batch/SplitBatchProducer.java ---------------------------------------------------------------------- diff --git a/example/src/main/java/org/apache/rocketmq/example/batch/SplitBatchProducer.java b/example/src/main/java/org/apache/rocketmq/example/batch/SplitBatchProducer.java index 8809a11..f9495c4 100644 --- a/example/src/main/java/org/apache/rocketmq/example/batch/SplitBatchProducer.java +++ b/example/src/main/java/org/apache/rocketmq/example/batch/SplitBatchProducer.java @@ -26,7 +26,7 @@ import org.apache.rocketmq.common.message.Message; public class SplitBatchProducer { - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws Exception { DefaultMQProducer producer = new DefaultMQProducer("BatchProducerGroupName"); producer.start(); @@ -41,25 +41,29 @@ public class SplitBatchProducer { //split the large batch into small ones: ListSplitter splitter = new ListSplitter(messages); while (splitter.hasNext()) { - List<Message> listItem = splitter.next(); + List<Message> listItem = splitter.next(); producer.send(listItem); } } } - class ListSplitter implements Iterator<List<Message>> { private int sizeLimit = 1000 * 1000; private final List<Message> messages; private int currIndex; + public ListSplitter(List<Message> messages) { this.messages = messages; } - @Override public boolean hasNext() { + + @Override + public boolean hasNext() { return currIndex < messages.size(); } - @Override public List<Message> next() { + + @Override + public List<Message> next() { int nextIndex = currIndex; int totalSize = 0; for (; nextIndex < messages.size(); nextIndex++) { @@ -91,7 +95,8 @@ class ListSplitter implements Iterator<List<Message>> { return subList; } - @Override public void remove() { + @Override + public void remove() { throw new UnsupportedOperationException("Not allowed to remove"); } } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/example/src/main/java/org/apache/rocketmq/example/benchmark/Producer.java ---------------------------------------------------------------------- diff --git a/example/src/main/java/org/apache/rocketmq/example/benchmark/Producer.java b/example/src/main/java/org/apache/rocketmq/example/benchmark/Producer.java index 2d8d0f6..9bd5266 100644 --- a/example/src/main/java/org/apache/rocketmq/example/benchmark/Producer.java +++ b/example/src/main/java/org/apache/rocketmq/example/benchmark/Producer.java @@ -242,7 +242,7 @@ class StatsBenchmarkProducer { private final AtomicLong sendMessageMaxRT = new AtomicLong(0L); public Long[] createSnapshot() { - Long[] snap = new Long[]{ + Long[] snap = new Long[] { System.currentTimeMillis(), this.sendRequestSuccessCount.get(), this.sendRequestFailedCount.get(), http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/example/src/main/java/org/apache/rocketmq/example/filter/SqlConsumer.java ---------------------------------------------------------------------- diff --git a/example/src/main/java/org/apache/rocketmq/example/filter/SqlConsumer.java b/example/src/main/java/org/apache/rocketmq/example/filter/SqlConsumer.java index 52c2474..8421675 100644 --- a/example/src/main/java/org/apache/rocketmq/example/filter/SqlConsumer.java +++ b/example/src/main/java/org/apache/rocketmq/example/filter/SqlConsumer.java @@ -44,7 +44,7 @@ public class SqlConsumer { @Override public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, - ConsumeConcurrentlyContext context) { + ConsumeConcurrentlyContext context) { System.out.printf(Thread.currentThread().getName() + " Receive New Messages: " + msgs + "%n"); return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/example/src/main/java/org/apache/rocketmq/example/simple/AsyncProducer.java ---------------------------------------------------------------------- diff --git a/example/src/main/java/org/apache/rocketmq/example/simple/AsyncProducer.java b/example/src/main/java/org/apache/rocketmq/example/simple/AsyncProducer.java index 038ea65..aa15caf 100644 --- a/example/src/main/java/org/apache/rocketmq/example/simple/AsyncProducer.java +++ b/example/src/main/java/org/apache/rocketmq/example/simple/AsyncProducer.java @@ -25,7 +25,8 @@ import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.remoting.common.RemotingHelper; public class AsyncProducer { - public static void main(String[] args) throws MQClientException, InterruptedException, UnsupportedEncodingException { + public static void main( + String[] args) throws MQClientException, InterruptedException, UnsupportedEncodingException { DefaultMQProducer producer = new DefaultMQProducer("Jodie_Daily_test"); producer.start(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java ---------------------------------------------------------------------- diff --git a/example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java b/example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java index 9bd9ea1..43bbf6c 100644 --- a/example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java +++ b/example/src/main/java/org/apache/rocketmq/example/simple/PushConsumer.java @@ -35,7 +35,6 @@ public class PushConsumer { consumer.setConsumeTimestamp("20170422221800"); consumer.registerMessageListener(new MessageListenerConcurrently() { - @Override public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext context) { System.out.printf(Thread.currentThread().getName() + " Receive New Messages: " + msgs + "%n"); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/FilterFactory.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/FilterFactory.java b/filter/src/main/java/org/apache/rocketmq/filter/FilterFactory.java index a318548..f1e1c7d 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/FilterFactory.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/FilterFactory.java @@ -38,8 +38,6 @@ public class FilterFactory { * <br> * Note: * <li>1. Filter registered will be used in broker server, so take care of it's reliability and performance.</li> - * - * @param filterSpi */ public void register(FilterSpi filterSpi) { if (FILTER_SPI_HOLDER.containsKey(filterSpi.ofType())) { @@ -51,9 +49,6 @@ public class FilterFactory { /** * Un register a filter. - * - * @param type - * @return */ public FilterSpi unRegister(String type) { return FILTER_SPI_HOLDER.remove(type); @@ -61,9 +56,6 @@ public class FilterFactory { /** * Get a filter registered, null if none exist. - * - * @param type - * @return */ public FilterSpi get(String type) { return FILTER_SPI_HOLDER.get(type); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/FilterSpi.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/FilterSpi.java b/filter/src/main/java/org/apache/rocketmq/filter/FilterSpi.java index fcc39fa..f2d9f1c 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/FilterSpi.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/FilterSpi.java @@ -27,17 +27,11 @@ public interface FilterSpi { /** * Compile. - * - * @param expr - * @return - * @throws org.apache.rocketmq.filter.expression.MQFilterException */ Expression compile(final String expr) throws MQFilterException; /** * Which type. - * - * @return */ String ofType(); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/expression/BinaryExpression.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/expression/BinaryExpression.java b/filter/src/main/java/org/apache/rocketmq/filter/expression/BinaryExpression.java index 0f172e3..a3bf66b 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/expression/BinaryExpression.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/expression/BinaryExpression.java @@ -69,8 +69,6 @@ public abstract class BinaryExpression implements Expression { /** * Returns the symbol that represents this binary expression. For example, addition is * represented by "+" - * - * @return */ public abstract String getExpressionSymbol(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/expression/BooleanExpression.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/expression/BooleanExpression.java b/filter/src/main/java/org/apache/rocketmq/filter/expression/BooleanExpression.java index bb54632..068b362 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/expression/BooleanExpression.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/expression/BooleanExpression.java @@ -30,9 +30,7 @@ package org.apache.rocketmq.filter.expression; public interface BooleanExpression extends Expression { /** - * @param context * @return true if the expression evaluates to Boolean.TRUE. - * @throws Exception */ boolean matches(EvaluationContext context) throws Exception; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/expression/ComparisonExpression.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/expression/ComparisonExpression.java b/filter/src/main/java/org/apache/rocketmq/filter/expression/ComparisonExpression.java index 8b82e57..fe898e7 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/expression/ComparisonExpression.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/expression/ComparisonExpression.java @@ -203,8 +203,6 @@ public abstract class ComparisonExpression extends BinaryExpression implements B /** * Only Numeric expressions can be used in >, >=, < or <= expressions.s - * - * @param expr */ public static void checkLessThanOperand(Expression expr) { if (expr instanceof ConstantExpression) { @@ -224,8 +222,6 @@ public abstract class ComparisonExpression extends BinaryExpression implements B /** * Validates that the expression can be used in == or <> expression. Cannot * not be NULL TRUE or FALSE litterals. - * - * @param expr */ public static void checkEqualOperand(Expression expr) { if (expr instanceof ConstantExpression) { http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/expression/ConstantExpression.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/expression/ConstantExpression.java b/filter/src/main/java/org/apache/rocketmq/filter/expression/ConstantExpression.java index ca70f51..e649f5a 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/expression/ConstantExpression.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/expression/ConstantExpression.java @@ -136,8 +136,6 @@ public class ConstantExpression implements Expression { /** * Encodes the value of string so that it looks like it would look like when * it was provided in a selector. - * - * @return */ public static String encodeString(String s) { StringBuffer b = new StringBuffer(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/expression/EvaluationContext.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/expression/EvaluationContext.java b/filter/src/main/java/org/apache/rocketmq/filter/expression/EvaluationContext.java index 094ef53..1bea15b 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/expression/EvaluationContext.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/expression/EvaluationContext.java @@ -28,16 +28,11 @@ public interface EvaluationContext { /** * Get value by name from context - * - * @param name - * @return */ Object get(String name); /** * Context variables. - * - * @return */ Map<String, Object> keyValues(); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryExpression.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryExpression.java b/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryExpression.java index 0519f4d..24845fc 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryExpression.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryExpression.java @@ -71,7 +71,7 @@ public abstract class UnaryExpression implements Expression { } public static BooleanExpression createInExpression(PropertyExpression right, List<Object> elements, - final boolean not) { + final boolean not) { // Use a HashSet if there are many elements. Collection<Object> t; @@ -259,8 +259,6 @@ public abstract class UnaryExpression implements Expression { /** * Returns the symbol that represents this binary expression. For example, * addition is represented by "+" - * - * @return */ public abstract String getExpressionSymbol(); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryInExpression.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryInExpression.java b/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryInExpression.java index a6cf173..653cd92 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryInExpression.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/expression/UnaryInExpression.java @@ -31,7 +31,7 @@ abstract public class UnaryInExpression extends UnaryExpression implements Boole private Collection inList; public UnaryInExpression(Expression left, UnaryType unaryType, - Collection inList, boolean not) { + Collection inList, boolean not) { super(left, unaryType); this.setInList(inList); this.setNot(not); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/parser/ParseException.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/parser/ParseException.java b/filter/src/main/java/org/apache/rocketmq/filter/parser/ParseException.java index 2ccccaf..06014cb 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/parser/ParseException.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/parser/ParseException.java @@ -44,8 +44,8 @@ public class ParseException extends Exception { * "expectedTokenSequences", and "TOKEN_IMAGE" set. */ public ParseException(Token currentTokenVal, - int[][] expectedTokenSequencesVal, - String[] tokenImageVal + int[][] expectedTokenSequencesVal, + String[] tokenImageVal ) { super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal)); currentToken = currentTokenVal; @@ -103,8 +103,8 @@ public class ParseException extends Exception { * gets displayed. */ private static String initialise(Token currentToken, - int[][] expectedTokenSequences, - String[] tokenImage) { + int[][] expectedTokenSequences, + String[] tokenImage) { String eol = System.getProperty("line.separator", "\n"); StringBuffer expected = new StringBuffer(); int maxSize = 0; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.java b/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.java index 2948c10..198aacf 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParser.java @@ -996,12 +996,13 @@ public class SelectorParser implements SelectorParserConstants { } private static void jj_la1_init_0() { - jjLa10 = new int[]{0x400, 0x200, 0xc10000, 0xc00000, 0x10000, 0xf001900, 0x20000000, 0x20000000, 0xf000800, + jjLa10 = new int[] { + 0x400, 0x200, 0xc10000, 0xc00000, 0x10000, 0xf001900, 0x20000000, 0x20000000, 0xf000800, 0x1000, 0x1036e100, 0x1036e000, 0x16e000}; } private static void jj_la1_init_1() { - jjLa11 = new int[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0}; + jjLa11 = new int[] {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0}; } final private JJCalls[] jj2Rtns = new JJCalls[4]; @@ -1322,7 +1323,8 @@ public class SelectorParser implements SelectorParserConstants { } } p = p.next; - } while (p != null); + } + while (p != null); } catch (LookaheadSuccess ls) { } } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParserTokenManager.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParserTokenManager.java b/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParserTokenManager.java index 354f5ba..b5bac98 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParserTokenManager.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/parser/SelectorParserTokenManager.java @@ -385,7 +385,7 @@ public class SelectorParserTokenManager implements SelectorParserConstants { int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; - for (;;) { + for (; ; ) { if (++jjround == 0x7fffffff) ReInitRounds(); if (curChar < 64) { @@ -586,7 +586,8 @@ public class SelectorParserTokenManager implements SelectorParserConstants { default: break; } - } while (i != startsAt); + } + while (i != startsAt); } else if (curChar < 128) { long l = 1L << (curChar & 077); do { @@ -631,7 +632,8 @@ public class SelectorParserTokenManager implements SelectorParserConstants { default: break; } - } while (i != startsAt); + } + while (i != startsAt); } else { int hiByte = (int) (curChar >> 8); int i1 = hiByte >> 6; @@ -660,7 +662,8 @@ public class SelectorParserTokenManager implements SelectorParserConstants { default: break; } - } while (i != startsAt); + } + while (i != startsAt); } if (kind != 0x7fffffff) { jjmatchedKind = kind; @@ -834,7 +837,7 @@ public class SelectorParserTokenManager implements SelectorParserConstants { int curPos = 0; EOFLoop: - for (;;) { + for (; ; ) { try { curChar = inputStream.BeginToken(); } catch (java.io.IOException e) { @@ -902,7 +905,8 @@ public class SelectorParserTokenManager implements SelectorParserConstants { private void jjAddStates(int start, int end) { do { jjstateSet[jjnewStateCnt++] = JJ_NEXT_STATES[start]; - } while (start++ != end); + } + while (start++ != end); } private void jjCheckNAddTwoStates(int state1, int state2) { @@ -913,7 +917,8 @@ public class SelectorParserTokenManager implements SelectorParserConstants { private void jjCheckNAddStates(int start, int end) { do { jjCheckNAdd(JJ_NEXT_STATES[start]); - } while (start++ != end); + } + while (start++ != end); } } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/parser/SimpleCharStream.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/parser/SimpleCharStream.java b/filter/src/main/java/org/apache/rocketmq/filter/parser/SimpleCharStream.java index 94a54b4..53f7e1c 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/parser/SimpleCharStream.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/parser/SimpleCharStream.java @@ -264,7 +264,7 @@ public class SimpleCharStream { * Constructor. */ public SimpleCharStream(java.io.Reader dstream, int startline, - int startcolumn, int buffersize) { + int startcolumn, int buffersize) { inputStream = dstream; line = startline; column = startcolumn - 1; @@ -279,7 +279,7 @@ public class SimpleCharStream { * Constructor. */ public SimpleCharStream(java.io.Reader dstream, int startline, - int startcolumn) { + int startcolumn) { this(dstream, startline, startcolumn, 4096); } @@ -294,7 +294,7 @@ public class SimpleCharStream { * Reinitialise. */ public void ReInit(java.io.Reader dstream, int startline, - int startcolumn, int buffersize) { + int startcolumn, int buffersize) { inputStream = dstream; line = startline; column = startcolumn - 1; @@ -314,7 +314,7 @@ public class SimpleCharStream { * Reinitialise. */ public void ReInit(java.io.Reader dstream, int startline, - int startcolumn) { + int startcolumn) { ReInit(dstream, startline, startcolumn, 4096); } @@ -329,7 +329,7 @@ public class SimpleCharStream { * Constructor. */ public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline, - int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException { + int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException { this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize); @@ -339,7 +339,7 @@ public class SimpleCharStream { * Constructor. */ public SimpleCharStream(java.io.InputStream dstream, int startline, - int startcolumn, int buffersize) { + int startcolumn, int buffersize) { this(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize); } @@ -347,7 +347,7 @@ public class SimpleCharStream { * Constructor. */ public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline, - int startcolumn) throws java.io.UnsupportedEncodingException { + int startcolumn) throws java.io.UnsupportedEncodingException { this(dstream, encoding, startline, startcolumn, 4096); } @@ -355,7 +355,7 @@ public class SimpleCharStream { * Constructor. */ public SimpleCharStream(java.io.InputStream dstream, int startline, - int startcolumn) { + int startcolumn) { this(dstream, startline, startcolumn, 4096); } @@ -377,7 +377,7 @@ public class SimpleCharStream { * Reinitialise. */ public void ReInit(java.io.InputStream dstream, String encoding, int startline, - int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException { + int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException { ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize); @@ -387,7 +387,7 @@ public class SimpleCharStream { * Reinitialise. */ public void ReInit(java.io.InputStream dstream, int startline, - int startcolumn, int buffersize) { + int startcolumn, int buffersize) { ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize); } @@ -409,7 +409,7 @@ public class SimpleCharStream { * Reinitialise. */ public void ReInit(java.io.InputStream dstream, String encoding, int startline, - int startcolumn) throws java.io.UnsupportedEncodingException { + int startcolumn) throws java.io.UnsupportedEncodingException { ReInit(dstream, encoding, startline, startcolumn, 4096); } @@ -417,7 +417,7 @@ public class SimpleCharStream { * Reinitialise. */ public void ReInit(java.io.InputStream dstream, int startline, - int startcolumn) { + int startcolumn) { ReInit(dstream, startline, startcolumn, 4096); } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/parser/TokenMgrError.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/parser/TokenMgrError.java b/filter/src/main/java/org/apache/rocketmq/filter/parser/TokenMgrError.java index 75d83e5..e8132df 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/parser/TokenMgrError.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/parser/TokenMgrError.java @@ -122,7 +122,7 @@ public class TokenMgrError extends Error { * Note: You can customize the lexical error message by modifying this method. */ protected static String LexicalError(boolean eofSeen, int lexState, int errorLine, int errorColumn, - String errorAfter, char curChar) { + String errorAfter, char curChar) { return "Lexical error at line " + errorLine + ", column " + errorColumn + ". Encountered: " + @@ -167,7 +167,7 @@ public class TokenMgrError extends Error { * Full Constructor. */ public TokenMgrError(boolean eofSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, - int reason) { + int reason) { this(LexicalError(eofSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/util/BloomFilter.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/util/BloomFilter.java b/filter/src/main/java/org/apache/rocketmq/filter/util/BloomFilter.java index f610906..9a3de60 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/util/BloomFilter.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/util/BloomFilter.java @@ -42,7 +42,6 @@ public class BloomFilter { * * @param f error rate * @param n num will mapping to bit - * @return */ public static BloomFilter createByFn(int f, int n) { return new BloomFilter(f, n); @@ -87,9 +86,6 @@ public class BloomFilter { * See "Less Hashing, Same Performance: Building a Better Bloom Filter" by Adam Kirsch and Michael * Mitzenmacher. * </p> - * - * @param str - * @return */ public int[] calcBitPositions(String str) { int[] bitPositions = new int[this.k]; @@ -113,9 +109,6 @@ public class BloomFilter { /** * Calculate bit positions of {@code str} to construct {@code BloomFilterData} - * - * @param str - * @return */ public BloomFilterData generate(String str) { int[] bitPositions = calcBitPositions(str); @@ -125,9 +118,6 @@ public class BloomFilter { /** * Calculate bit positions of {@code str}, then set the related {@code bits} positions to 1. - * - * @param str - * @param bits */ public void hashTo(String str, BitsArray bits) { hashTo(calcBitPositions(str), bits); @@ -135,9 +125,6 @@ public class BloomFilter { /** * Set the related {@code bits} positions to 1. - * - * @param bitPositions - * @param bits */ public void hashTo(int[] bitPositions, BitsArray bits) { check(bits); @@ -153,9 +140,6 @@ public class BloomFilter { * <p> * Then set the related {@code bits} positions to 1. * </p> - * - * @param filterData - * @param bits */ public void hashTo(BloomFilterData filterData, BitsArray bits) { if (!isValid(filterData)) { @@ -170,8 +154,6 @@ public class BloomFilter { /** * Calculate bit positions of {@code str}, then check all the related {@code bits} positions is 1. * - * @param str - * @param bits * @return true: all the related {@code bits} positions is 1 */ public boolean isHit(String str, BitsArray bits) { @@ -181,8 +163,6 @@ public class BloomFilter { /** * Check all the related {@code bits} positions is 1. * - * @param bitPositions - * @param bits * @return true: all the related {@code bits} positions is 1 */ public boolean isHit(int[] bitPositions, BitsArray bits) { @@ -197,8 +177,6 @@ public class BloomFilter { /** * Check all the related {@code bits} positions is 1. * - * @param filterData - * @param bits * @return true: all the related {@code bits} positions is 1 */ public boolean isHit(BloomFilterData filterData, BitsArray bits) { @@ -214,8 +192,6 @@ public class BloomFilter { /** * Check whether one of {@code bitPositions} has been occupied. * - * @param bitPositions - * @param bits * @return true: if all positions have been occupied. */ public boolean checkFalseHit(int[] bitPositions, BitsArray bits) { @@ -246,9 +222,6 @@ public class BloomFilter { * <li>2. {@link org.apache.rocketmq.filter.util.BloomFilterData#getBitNum} must be equal to {@code m} </li> * <li>3. {@link org.apache.rocketmq.filter.util.BloomFilterData#getBitPos} is not null</li> * <li>4. {@link org.apache.rocketmq.filter.util.BloomFilterData#getBitPos}'s length is equal to {@code k}</li> - * - * @param filterData - * @return */ public boolean isValid(BloomFilterData filterData) { if (filterData == null @@ -263,8 +236,6 @@ public class BloomFilter { /** * error rate. - * - * @return */ public int getF() { return f; @@ -272,8 +243,6 @@ public class BloomFilter { /** * expect mapping num. - * - * @return */ public int getN() { return n; @@ -281,8 +250,6 @@ public class BloomFilter { /** * hash function num. - * - * @return */ public int getK() { return k; @@ -290,8 +257,6 @@ public class BloomFilter { /** * total bit num. - * - * @return */ public int getM() { return m; http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/main/java/org/apache/rocketmq/filter/util/BloomFilterData.java ---------------------------------------------------------------------- diff --git a/filter/src/main/java/org/apache/rocketmq/filter/util/BloomFilterData.java b/filter/src/main/java/org/apache/rocketmq/filter/util/BloomFilterData.java index de02d92..c021323 100644 --- a/filter/src/main/java/org/apache/rocketmq/filter/util/BloomFilterData.java +++ b/filter/src/main/java/org/apache/rocketmq/filter/util/BloomFilterData.java @@ -55,13 +55,17 @@ public class BloomFilterData { @Override public boolean equals(final Object o) { - if (this == o) return true; - if (!(o instanceof BloomFilterData)) return false; + if (this == o) + return true; + if (!(o instanceof BloomFilterData)) + return false; final BloomFilterData that = (BloomFilterData) o; - if (bitNum != that.bitNum) return false; - if (!Arrays.equals(bitPos, that.bitPos)) return false; + if (bitNum != that.bitNum) + return false; + if (!Arrays.equals(bitPos, that.bitPos)) + return false; return true; } http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/test/java/org/apache/rocketmq/filter/BitsArrayTest.java ---------------------------------------------------------------------- diff --git a/filter/src/test/java/org/apache/rocketmq/filter/BitsArrayTest.java b/filter/src/test/java/org/apache/rocketmq/filter/BitsArrayTest.java index ef81b29..1ba7360 100644 --- a/filter/src/test/java/org/apache/rocketmq/filter/BitsArrayTest.java +++ b/filter/src/test/java/org/apache/rocketmq/filter/BitsArrayTest.java @@ -111,8 +111,8 @@ public class BitsArrayTest { @Test public void testOr() { - BitsArray b1 = BitsArray.create(new byte[]{(byte) 0xff, 0x00}); - BitsArray b2 = BitsArray.create(new byte[]{0x00, (byte) 0xff}); + BitsArray b1 = BitsArray.create(new byte[] {(byte) 0xff, 0x00}); + BitsArray b2 = BitsArray.create(new byte[] {0x00, (byte) 0xff}); b1.or(b2); http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/97aa813e/filter/src/test/java/org/apache/rocketmq/filter/BloomFilterTest.java ---------------------------------------------------------------------- diff --git a/filter/src/test/java/org/apache/rocketmq/filter/BloomFilterTest.java b/filter/src/test/java/org/apache/rocketmq/filter/BloomFilterTest.java index c6097ee..d2425b4 100644 --- a/filter/src/test/java/org/apache/rocketmq/filter/BloomFilterTest.java +++ b/filter/src/test/java/org/apache/rocketmq/filter/BloomFilterTest.java @@ -107,9 +107,9 @@ public class BloomFilterTest { @Test public void testBloomFilterData() { - BloomFilterData bloomFilterData = new BloomFilterData(new int[]{1, 2, 3}, 128); - BloomFilterData bloomFilterData1 = new BloomFilterData(new int[]{1, 2, 3}, 128); - BloomFilterData bloomFilterData2 = new BloomFilterData(new int[]{1, 2, 3}, 129); + BloomFilterData bloomFilterData = new BloomFilterData(new int[] {1, 2, 3}, 128); + BloomFilterData bloomFilterData1 = new BloomFilterData(new int[] {1, 2, 3}, 128); + BloomFilterData bloomFilterData2 = new BloomFilterData(new int[] {1, 2, 3}, 129); assertThat(bloomFilterData).isEqualTo(bloomFilterData1); assertThat(bloomFilterData2).isNotEqualTo(bloomFilterData); @@ -127,7 +127,7 @@ public class BloomFilterTest { assertThat(bloomFilterData).isEqualTo(bloomFilterData2); - bloomFilterData2.setBitPos(new int[]{1, 2, 3, 4}); + bloomFilterData2.setBitPos(new int[] {1, 2, 3, 4}); assertThat(bloomFilterData).isNotEqualTo(bloomFilterData2);