You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/03/01 22:20:48 UTC
[GitHub] merlimat closed pull request #1315: Remove deprecated newConnect methods
merlimat closed pull request #1315: Remove deprecated newConnect methods
URL: https://github.com/apache/incubator-pulsar/pull/1315
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/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
index 486f1cdee..615849524 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
@@ -58,6 +58,7 @@
import org.apache.bookkeeper.mledger.ManagedLedgerException;
import org.apache.bookkeeper.mledger.ManagedLedgerFactory;
import org.apache.bookkeeper.mledger.impl.PositionImpl;
+import org.apache.bookkeeper.tools.cli.helpers.Command;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.admin.AdminResource;
@@ -75,6 +76,7 @@
import org.apache.pulsar.common.api.Commands;
import org.apache.pulsar.common.api.Commands.ChecksumType;
import org.apache.pulsar.common.api.PulsarHandler;
+import org.apache.pulsar.common.api.proto.PulsarApi;
import org.apache.pulsar.common.api.proto.PulsarApi.AuthMethod;
import org.apache.pulsar.common.api.proto.PulsarApi.CommandAck.AckType;
import org.apache.pulsar.common.api.proto.PulsarApi.CommandConnected;
@@ -210,6 +212,24 @@ public void testConnectCommand() throws Exception {
channel.finish();
}
+ private static ByteBuf newConnect(AuthMethod authMethod, String authData, int protocolVersion) {
+ PulsarApi.CommandConnect.Builder connectBuilder = PulsarApi.CommandConnect.newBuilder();
+ connectBuilder.setClientVersion("Pulsar Client");
+ connectBuilder.setAuthMethod(authMethod);
+ connectBuilder.setAuthData(ByteString.copyFromUtf8(authData));
+ connectBuilder.setProtocolVersion(protocolVersion);
+ PulsarApi.CommandConnect connect = connectBuilder.build();
+ ByteBuf res = Commands.serializeWithSize(PulsarApi.BaseCommand.newBuilder().setType(PulsarApi.BaseCommand.Type.CONNECT).setConnect(connect));
+ connect.recycle();
+ connectBuilder.recycle();
+ return res;
+ }
+
+ /**
+ * Ensure that old clients may still connect to new servers
+ *
+ * @throws Exception
+ */
@Test(timeOut = 30000)
public void testConnectCommandWithEnum() throws Exception {
resetChannel();
@@ -217,8 +237,7 @@ public void testConnectCommandWithEnum() throws Exception {
assertEquals(serverCnx.getState(), State.Start);
// test server response to CONNECT
- @SuppressWarnings("deprecation") // We're actually testing that the deprecated method still works
- ByteBuf clientCommand = Commands.newConnect(AuthMethod.AuthMethodNone, "");
+ ByteBuf clientCommand = newConnect(AuthMethod.AuthMethodNone, "", Commands.getCurrentProtocolVersion());
channel.writeInbound(clientCommand);
assertEquals(serverCnx.getState(), State.Connected);
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/api/Commands.java b/pulsar-common/src/main/java/org/apache/pulsar/common/api/Commands.java
index 073de6b0a..b51d29ea0 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/api/Commands.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/api/Commands.java
@@ -21,6 +21,7 @@
import static com.scurrilous.circe.checksum.Crc32cIntChecksum.computeChecksum;
import static com.scurrilous.circe.checksum.Crc32cIntChecksum.resumeChecksum;
+import com.google.common.annotations.VisibleForTesting;
import com.google.protobuf.ByteString;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.PooledByteBufAllocator;
@@ -136,33 +137,6 @@ public static ByteBuf newConnect(String authMethodName, String authData, int pro
return res;
}
- /**
- * @deprecated AuthMethod has been deprecated. Use {@link #newConnect(String authMethodName, String authData)}
- * instead.
- */
- @Deprecated
- public static ByteBuf newConnect(AuthMethod authMethod, String authData) {
- return newConnect(authMethod, authData, getCurrentProtocolVersion());
- }
-
- /**
- * @deprecated AuthMethod has been deprecated. Use
- * {@link #newConnect(String authMethodName, String authData, int protocolVersion)} instead.
- */
- @Deprecated
- public static ByteBuf newConnect(AuthMethod authMethod, String authData, int protocolVersion) {
- CommandConnect.Builder connectBuilder = CommandConnect.newBuilder();
- connectBuilder.setClientVersion("Pulsar Client");
- connectBuilder.setAuthMethod(authMethod);
- connectBuilder.setAuthData(ByteString.copyFromUtf8(authData));
- connectBuilder.setProtocolVersion(protocolVersion);
- CommandConnect connect = connectBuilder.build();
- ByteBuf res = serializeWithSize(BaseCommand.newBuilder().setType(Type.CONNECT).setConnect(connect));
- connect.recycle();
- connectBuilder.recycle();
- return res;
- }
-
public static ByteBuf newConnected(int clientProtocolVersion) {
CommandConnected.Builder connectedBuilder = CommandConnected.newBuilder();
connectedBuilder.setServerVersion("Pulsar Server");
@@ -702,7 +676,8 @@ public static ByteBuf newGetLastMessageIdResponse(long requestId, MessageIdData
return res;
}
- private static ByteBuf serializeWithSize(BaseCommand.Builder cmdBuilder) {
+ @VisibleForTesting
+ public static ByteBuf serializeWithSize(BaseCommand.Builder cmdBuilder) {
// / Wire format
// [TOTAL_SIZE] [CMD_SIZE][CMD]
BaseCommand cmd = cmdBuilder.build();
@@ -941,7 +916,8 @@ private static ByteBufPair serializeCommandMessageWithSize(BaseCommand cmd, Byte
return (ByteBufPair) ByteBufPair.get(headers, metadataAndPayload);
}
- private static int getCurrentProtocolVersion() {
+ @VisibleForTesting
+ public static int getCurrentProtocolVersion() {
// Return the last ProtocolVersion enum value
return ProtocolVersion.values()[ProtocolVersion.values().length - 1].getNumber();
}
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services