[scylladb#597] Switching native-protocol dependency.

Author: nikagra

bom/pom.xml

@@ -81,9 +81,9 @@
         <version>4.19.0.2-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>com.datastax.oss</groupId>
+        <groupId>com.scylladb</groupId>
         <artifactId>native-protocol</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.2.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

core-shaded/pom.xml

@@ -58,7 +58,7 @@
     option of the shade plugin because it promotes all dependencies, even nested ones, to top level).
     -->
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>com.scylladb</groupId>
       <artifactId>native-protocol</artifactId>
     </dependency>
     <dependency>

core/pom.xml

@@ -46,7 +46,7 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>com.datastax.oss</groupId>
+      <groupId>com.scylladb</groupId>
       <artifactId>native-protocol</artifactId>
     </dependency>
     <dependency>

core/src/main/java/com/datastax/oss/driver/internal/core/channel/ChannelFactory.java

@@ -423,10 +423,10 @@ protected void initChannel(Channel channel) {
         pipeline
             .addLast(
                 FRAME_TO_BYTES_ENCODER_NAME,
-                new FrameEncoder(context.getFrameCodec(), new ProtocolFeatures(), maxFrameLength))
+                new FrameEncoder(context.getFrameCodec(), ProtocolFeatures.EMPTY, maxFrameLength))
             .addLast(
                 BYTES_TO_FRAME_DECODER_NAME,
-                new FrameDecoder(context.getFrameCodec(), new ProtocolFeatures(), maxFrameLength))
+                new FrameDecoder(context.getFrameCodec(), ProtocolFeatures.EMPTY, maxFrameLength))
             // Note: HeartbeatHandler is inserted here once init completes
             .addLast(INFLIGHT_HANDLER_NAME, inFlightHandler)
             .addLast(INIT_HANDLER_NAME, initHandler);

core/src/main/java/com/datastax/oss/driver/internal/core/channel/ProtocolInitHandler.java

@@ -437,8 +437,8 @@ private void maybeSwitchToModernFraming() {
 
   private void maybeUpdatePipelineWithProtocolOptions(boolean metadataIdEnabled) {
     if (metadataIdEnabled) {
-      ProtocolFeatures protocolFeatures = new ProtocolFeatures();
-      protocolFeatures.addFeature(ProtocolFeatures.Feature.SCYLLA_USE_METADATA_ID);
+      ProtocolFeatures protocolFeatures =
+          new ProtocolFeatures.Builder().setScyllaUseMetadataId().build();
       int maxFrameLength =
           (int)
               context

core/src/main/java/com/datastax/oss/driver/internal/core/protocol/SegmentToFrameDecoder.java

@@ -74,7 +74,7 @@ private void decodeSelfContained(Segment<ByteBuf> segment, List<Object> out) {
     int frameCount = 0;
     try {
       do {
-        Frame frame = frameCodec.decode(payload, new ProtocolFeatures());
+        Frame frame = frameCodec.decode(payload, ProtocolFeatures.EMPTY);
         LOG.trace(
             "[{}] Decoded response frame {} from self-contained segment",
             logPrefix,
@@ -111,7 +111,7 @@ private void decodeSlice(Segment<ByteBuf> segment, ByteBufAllocator allocator, L
       encodedFrame.addComponents(true, accumulatedSlices);
       Frame frame;
       try {
-        frame = frameCodec.decode(encodedFrame, new ProtocolFeatures());
+        frame = frameCodec.decode(encodedFrame, ProtocolFeatures.EMPTY);
       } finally {
         encodedFrame.release();
         // Reset our state

core/src/test/java/com/datastax/oss/driver/internal/core/protocol/FrameDecoderTest.java

@@ -64,7 +64,7 @@ public void setup() {
   @Test
   public void should_decode_valid_payload() {
     // Given
-    FrameDecoder decoder = new FrameDecoder(frameCodec, new ProtocolFeatures(), 1024);
+    FrameDecoder decoder = new FrameDecoder(frameCodec, ProtocolFeatures.EMPTY, 1024);
     channel.pipeline().addLast(decoder);
 
     // When
@@ -85,7 +85,7 @@ public void should_decode_valid_payload() {
   public void should_fail_to_decode_if_payload_is_valid_but_too_long() {
     // Given
     FrameDecoder decoder =
-        new FrameDecoder(frameCodec, new ProtocolFeatures(), VALID_PAYLOAD.readableBytes() - 1);
+        new FrameDecoder(frameCodec, ProtocolFeatures.EMPTY, VALID_PAYLOAD.readableBytes() - 1);
     channel.pipeline().addLast(decoder);
 
     // When
@@ -104,7 +104,7 @@ public void should_fail_to_decode_if_payload_is_valid_but_too_long() {
   @Test
   public void should_fail_to_decode_if_payload_cannot_be_decoded() {
     // Given
-    FrameDecoder decoder = new FrameDecoder(frameCodec, new ProtocolFeatures(), 1024);
+    FrameDecoder decoder = new FrameDecoder(frameCodec, ProtocolFeatures.EMPTY, 1024);
     channel.pipeline().addLast(decoder);
 
     // When

core/src/test/java/com/datastax/oss/driver/internal/core/protocol/SegmentToFrameDecoderTest.java

@@ -94,6 +94,6 @@ private static ByteBuf encodeFrame(Message message) {
             Collections.emptyMap(),
             Collections.emptyList(),
             message);
-    return FRAME_CODEC.encode(frame, new ProtocolFeatures());
+    return FRAME_CODEC.encode(frame, ProtocolFeatures.EMPTY);
   }
 }

pom.xml

@@ -99,6 +99,7 @@
     <skipTests>false</skipTests>
     <skipUnitTests>${skipTests}</skipUnitTests>
     <pushChanges>false</pushChanges>
+    <mockitoopens.argline/>
   </properties>
   <dependencyManagement>
     <dependencies>