wlliqipeng closed pull request #492: [ISSUE #461]Purge filterserv related code
in client
URL: https://github.com/apache/rocketmq/pull/492
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/client/src/main/java/org/apache/rocketmq/client/consumer/MQPushConsumer.java
b/client/src/main/java/org/apache/rocketmq/client/consumer/MQPushConsumer.java
index d56075c60..4cabf8f54 100644
---
a/client/src/main/java/org/apache/rocketmq/client/consumer/MQPushConsumer.java
+++
b/client/src/main/java/org/apache/rocketmq/client/consumer/MQPushConsumer.java
@@ -60,6 +60,7 @@
* @param fullClassName full class name,must extend
org.apache.rocketmq.common.filter. MessageFilter
* @param filterClassSource class source code,used UTF-8 file
encoding,must be responsible for your code safety
*/
+ @Deprecated
void subscribe(final String topic, final String fullClassName,
final String filterClassSource) throws MQClientException;
diff --git
a/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
b/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
index 1b3885629..8bd9d8890 100644
---
a/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
+++
b/client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
@@ -560,7 +560,7 @@ private void sendHeartbeatToAllBroker() {
}
}
}
-
+ @Deprecated
private void uploadFilterClassSource() {
Iterator<Entry<String, MQConsumerInner>> it =
this.consumerTable.entrySet().iterator();
while (it.hasNext()) {
@@ -720,7 +720,7 @@ private boolean isBrokerInNameServer(final String
brokerAddr) {
return false;
}
-
+ @Deprecated
private void uploadFilterClassToAllFilterServer(final String
consumerGroup, final String fullClassName,
final String topic,
final String filterClassSource) throws UnsupportedEncodingException {
diff --git a/common/src/test/java/org/apache/rocketmq/common/MixAllTest.java
b/common/src/test/java/org/apache/rocketmq/common/MixAllTest.java
index 3f0487202..315aabb47 100644
--- a/common/src/test/java/org/apache/rocketmq/common/MixAllTest.java
+++ b/common/src/test/java/org/apache/rocketmq/common/MixAllTest.java
@@ -33,7 +33,6 @@
public void testGetLocalInetAddress() throws Exception {
List<String> localInetAddress = MixAll.getLocalInetAddress();
String local = InetAddress.getLocalHost().getHostAddress();
- assertThat(localInetAddress).contains("127.0.0.1");
assertThat(localInetAddress).contains(local);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
