Skip to content

Commit d7decc8

Browse files
zhouxinyuzhouxinyu
committed
[ROCKETMQ-139] Degrade the client related modules' JDK version to 1.6
1 parent a146646 commit d7decc8

File tree

16 files changed

+41
-25
lines changed

16 files changed

+41
-25
lines changed

‎client/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,16 @@
2222
<version>4.1.0-incubating-SNAPSHOT</version>
2323
</parent>
2424

25-
2625
<modelVersion>4.0.0</modelVersion>
2726
<packaging>jar</packaging>
2827
<artifactId>rocketmq-client</artifactId>
2928
<name>rocketmq-client ${project.version}</name>
3029

30+
<properties>
31+
<maven.compiler.source>1.6</maven.compiler.source>
32+
<maven.compiler.target>1.6</maven.compiler.target>
33+
</properties>
34+
3135
<dependencies>
3236
<dependency>
3337
<groupId>${project.groupId}</groupId>

‎client/src/main/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public class DefaultMQPushConsumer extends ClientConfig implements MQPushConsume
133133
/**
134134
* Subscription relationship
135135
*/
136-
private Map<String /* topic */, String /* sub expression */> subscription = new HashMap<>();
136+
private Map<String /* topic */, String /* sub expression */> subscription = new HashMap<String, String>();
137137

138138
/**
139139
* Message listener

‎client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,11 @@ private void unregisterClient(final String producerGroup, final String consumerG
842842
try {
843843
this.mQClientAPIImpl.unregisterClient(addr, this.clientId, producerGroup, consumerGroup, 3000);
844844
log.info("unregister client[Producer: {} Consumer: {}] from broker[{} {} {}] success", producerGroup, consumerGroup, brokerName, entry1.getKey(), addr);
845-
} catch (RemotingException | InterruptedException | MQBrokerException e) {
845+
} catch (RemotingException e) {
846+
log.error("unregister client exception from broker: " + addr, e);
847+
} catch (InterruptedException e) {
848+
log.error("unregister client exception from broker: " + addr, e);
849+
} catch (MQBrokerException e) {
846850
log.error("unregister client exception from broker: " + addr, e);
847851
}
848852
}

‎client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPullConsumerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void testPullMessage_Success() throws Exception {
9999
assertThat(pullResult.getNextBeginOffset()).isEqualTo(1024 + 1);
100100
assertThat(pullResult.getMinOffset()).isEqualTo(123);
101101
assertThat(pullResult.getMaxOffset()).isEqualTo(2048);
102-
assertThat(pullResult.getMsgFoundList()).isEqualTo(new ArrayList<>());
102+
assertThat(pullResult.getMsgFoundList()).isEqualTo(new ArrayList<Object>());
103103
}
104104

105105
@Test
@@ -137,7 +137,7 @@ public void testPullMessageAsync_Success() throws Exception {
137137
assertThat(pullResult.getNextBeginOffset()).isEqualTo(1024 + 1);
138138
assertThat(pullResult.getMinOffset()).isEqualTo(123);
139139
assertThat(pullResult.getMaxOffset()).isEqualTo(2048);
140-
assertThat(pullResult.getMsgFoundList()).isEqualTo(new ArrayList<>());
140+
assertThat(pullResult.getMsgFoundList()).isEqualTo(new ArrayList<Object>());
141141
}
142142

143143
@Override public void onException(Throwable e) {

‎client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void init() throws Exception {
143143

144144
doReturn(new FindBrokerResult("127.0.0.1:10911", false)).when(mQClientFactory).findBrokerAddressInSubscribe(anyString(), anyLong(), anyBoolean());
145145
doReturn(Collections.singletonList(mQClientFactory.getClientId())).when(mQClientFactory).findConsumerIdList(anyString(), anyString());
146-
Set<MessageQueue> messageQueueSet = new HashSet<>();
146+
Set<MessageQueue> messageQueueSet = new HashSet<MessageQueue>();
147147
messageQueueSet.add(createPullRequest().getMessageQueue());
148148
pushConsumer.getDefaultMQPushConsumerImpl().updateTopicSubscribeInfo(topic, messageQueueSet);
149149
doReturn(123L).when(rebalancePushImpl).computePullFromWhere(any(MessageQueue.class));

‎client/src/test/java/org/apache/rocketmq/client/consumer/store/LocalFileOffsetStoreTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void testReadOffset_FromStore() throws Exception {
6969
offsetStore.updateOffset(messageQueue, 1024, false);
7070
assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE)).isEqualTo(-1);
7171

72-
offsetStore.persistAll(new HashSet<>(Collections.singletonList(messageQueue)));
72+
offsetStore.persistAll(new HashSet<MessageQueue>(Collections.singletonList(messageQueue)));
7373
assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE)).isEqualTo(1024);
7474
}
7575
}

‎client/src/test/java/org/apache/rocketmq/client/consumer/store/RemoteBrokerOffsetStoreTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void testReadOffset_Success() throws Exception {
119119
assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE)).isEqualTo(1023);
120120

121121
offsetStore.updateOffset(messageQueue, 1025, false);
122-
offsetStore.persistAll(new HashSet<>(Collections.singletonList(messageQueue)));
122+
offsetStore.persistAll(new HashSet<MessageQueue>(Collections.singletonList(messageQueue)));
123123
assertThat(offsetStore.readOffset(messageQueue, ReadOffsetType.READ_FROM_STORE)).isEqualTo(1025);
124124
}
125125

‎client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ public void testTopicRouteData2TopicPublishInfo() {
4848
TopicRouteData topicRouteData = new TopicRouteData();
4949

5050
topicRouteData.setFilterServerTable(new HashMap<String, List<String>>());
51-
List<BrokerData> brokerDataList = new ArrayList<>();
51+
List<BrokerData> brokerDataList = new ArrayList<BrokerData>();
5252
BrokerData brokerData = new BrokerData();
5353
brokerData.setBrokerName("BrokerA");
5454
brokerData.setCluster("DefaultCluster");
55-
HashMap<Long, String> brokerAddrs = new HashMap<>();
55+
HashMap<Long, String> brokerAddrs = new HashMap<Long, String>();
5656
brokerAddrs.put(0L, "127.0.0.1:10911");
5757
brokerData.setBrokerAddrs(brokerAddrs);
5858
brokerDataList.add(brokerData);
5959
topicRouteData.setBrokerDatas(brokerDataList);
6060

61-
List<QueueData> queueDataList = new ArrayList<>();
61+
List<QueueData> queueDataList = new ArrayList<QueueData>();
6262
QueueData queueData = new QueueData();
6363
queueData.setBrokerName("BrokerA");
6464
queueData.setPerm(6);

‎client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,17 +194,17 @@ public static TopicRouteData createTopicRoute() {
194194
TopicRouteData topicRouteData = new TopicRouteData();
195195

196196
topicRouteData.setFilterServerTable(new HashMap<String, List<String>>());
197-
List<BrokerData> brokerDataList = new ArrayList<>();
197+
List<BrokerData> brokerDataList = new ArrayList<BrokerData>();
198198
BrokerData brokerData = new BrokerData();
199199
brokerData.setBrokerName("BrokerA");
200200
brokerData.setCluster("DefaultCluster");
201-
HashMap<Long, String> brokerAddrs = new HashMap<>();
201+
HashMap<Long, String> brokerAddrs = new HashMap<Long, String>();
202202
brokerAddrs.put(0L, "127.0.0.1:10911");
203203
brokerData.setBrokerAddrs(brokerAddrs);
204204
brokerDataList.add(brokerData);
205205
topicRouteData.setBrokerDatas(brokerDataList);
206206

207-
List<QueueData> queueDataList = new ArrayList<>();
207+
List<QueueData> queueDataList = new ArrayList<QueueData>();
208208
QueueData queueData = new QueueData();
209209
queueData.setBrokerName("BrokerA");
210210
queueData.setPerm(6);

‎client/src/test/java/org/apache/rocketmq/client/producer/selector/SelectMessageQueueByHashTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void testSelect() throws Exception {
3434

3535
Message message = new Message(topic, new byte[] {});
3636

37-
List<MessageQueue> messageQueues = new ArrayList<>();
37+
List<MessageQueue> messageQueues = new ArrayList<MessageQueue>();
3838
for (int i = 0; i < 10; i++) {
3939
MessageQueue messageQueue = new MessageQueue(topic, "DefaultBroker", i);
4040
messageQueues.add(messageQueue);

0 commit comments

Comments
 (0)