Re: [PR] Replace "protobuf-dynamic" lib with built-in protobuf methods (druid)

[via GitHub]

github-advanced-security[bot] commented on code in PR #18401:
URL: https://github.com/apache/druid/pull/18401#discussion_r2275345571


##########
extensions-core/protobuf-extensions/src/test/java/org/apache/druid/data/input/protobuf/FileBasedProtobufBytesDecoderTest.java:
##########
@@ -51,33 +53,39 @@
         "prototest.ProtoTestEvent"
     );
 
-    assertDoesNotThrow(decoder::initDescriptor);
+    assertEquals("prototest.ProtoTestEvent", 
decoder.getDescriptor().getFullName());
   }
 
   @Test
   public void testBadProto()
   {
-    assertThrows(
+    final var ex = assertThrows(
         ParseException.class,
         () -> {
-          // configure parser with desc file
-          final var decoder = new 
FileBasedProtobufBytesDecoder("prototest.desc", "BadName");
-          decoder.initDescriptor();
+          final var ignored = new 
FileBasedProtobufBytesDecoder("prototest.desc", "BadName");

Review Comment:
   ## Unread local variable
   
   Variable 'FileBasedProtobufBytesDecoder ignored' is never read.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/10173)



##########
extensions-core/protobuf-extensions/src/test/java/org/apache/druid/data/input/protobuf/InlineDescriptorProtobufBytesDecoderTest.java:
##########
@@ -52,67 +51,76 @@
   }
 
   @Test
-  public void testShortMessageType()
+  public void testUseShortMessageType()
   {
     final var decoder = new InlineDescriptorProtobufBytesDecoder(
         descString,
         "ProtoTestEvent"
     );
 
-    assertDoesNotThrow(decoder::initDescriptor);
+    assertEquals("prototest.ProtoTestEvent", 
decoder.getDescriptor().getFullName());
   }
 
   @Test
-  public void testLongMessageType()
+  public void testuseFullMessageType()
   {
     final var decoder = new InlineDescriptorProtobufBytesDecoder(
         descString,
         "prototest.ProtoTestEvent"
     );
 
-    assertDoesNotThrow(decoder::initDescriptor);
+    assertEquals("prototest.ProtoTestEvent", 
decoder.getDescriptor().getFullName());
   }
 
   @Test
   public void testBadProto()
   {
-    assertThrows(
+    final var ex = assertThrows(
         ParseException.class,
         () -> {
-          final var decoder = new 
InlineDescriptorProtobufBytesDecoder(descString, "BadName");
-
-          decoder.initDescriptor();
+          final var ignored = new 
InlineDescriptorProtobufBytesDecoder(descString, "BadName");

Review Comment:
   ## Unread local variable
   
   Variable 'InlineDescriptorProtobufBytesDecoder ignored' is never read.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/10175)



##########
extensions-core/protobuf-extensions/src/test/java/org/apache/druid/data/input/protobuf/InlineDescriptorProtobufBytesDecoderTest.java:
##########
@@ -52,67 +51,76 @@
   }
 
   @Test
-  public void testShortMessageType()
+  public void testUseShortMessageType()
   {
     final var decoder = new InlineDescriptorProtobufBytesDecoder(
         descString,
         "ProtoTestEvent"
     );
 
-    assertDoesNotThrow(decoder::initDescriptor);
+    assertEquals("prototest.ProtoTestEvent", 
decoder.getDescriptor().getFullName());
   }
 
   @Test
-  public void testLongMessageType()
+  public void testuseFullMessageType()
   {
     final var decoder = new InlineDescriptorProtobufBytesDecoder(
         descString,
         "prototest.ProtoTestEvent"
     );
 
-    assertDoesNotThrow(decoder::initDescriptor);
+    assertEquals("prototest.ProtoTestEvent", 
decoder.getDescriptor().getFullName());
   }
 
   @Test
   public void testBadProto()
   {
-    assertThrows(
+    final var ex = assertThrows(
         ParseException.class,
         () -> {
-          final var decoder = new 
InlineDescriptorProtobufBytesDecoder(descString, "BadName");
-
-          decoder.initDescriptor();
+          final var ignored = new 
InlineDescriptorProtobufBytesDecoder(descString, "BadName");
         }
     );
+
+    assertEquals(
+        "Protobuf message type [BadName] not found in the descriptor set. 
Available types: [Foo, ProtoTestEvent, ProtoTestEvent.Foo, Timestamp, 
google.protobuf.Timestamp, prototest.ProtoTestEvent, 
prototest.ProtoTestEvent.Foo]",
+        ex.getMessage()
+    );
   }
 
   @Test
   public void testMalformedDescriptorBase64()
   {
-    assertThrows(
+    final var ex = assertThrows(
         IAE.class,
         () -> {
-          final var decoder = new 
InlineDescriptorProtobufBytesDecoder("invalidString", "BadName");
-
-          decoder.initDescriptor();
+          final var ignored = new 
InlineDescriptorProtobufBytesDecoder("invalidString", "BadName");

Review Comment:
   ## Unread local variable
   
   Variable 'InlineDescriptorProtobufBytesDecoder ignored' is never read.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/10176)



##########
extensions-core/protobuf-extensions/src/test/java/org/apache/druid/data/input/protobuf/FileBasedProtobufBytesDecoderTest.java:
##########
@@ -51,33 +53,39 @@
         "prototest.ProtoTestEvent"
     );
 
-    assertDoesNotThrow(decoder::initDescriptor);
+    assertEquals("prototest.ProtoTestEvent", 
decoder.getDescriptor().getFullName());
   }
 
   @Test
   public void testBadProto()
   {
-    assertThrows(
+    final var ex = assertThrows(
         ParseException.class,
         () -> {
-          // configure parser with desc file
-          final var decoder = new 
FileBasedProtobufBytesDecoder("prototest.desc", "BadName");
-          decoder.initDescriptor();
+          final var ignored = new 
FileBasedProtobufBytesDecoder("prototest.desc", "BadName");
         }
     );
+
+    assertEquals(
+        "Protobuf message type [BadName] not found in the descriptor set. 
Available types: [Foo, ProtoTestEvent, ProtoTestEvent.Foo, Timestamp, 
google.protobuf.Timestamp, prototest.ProtoTestEvent, 
prototest.ProtoTestEvent.Foo]",
+        ex.getMessage()
+    );
   }
 
   @Test
   public void testMalformedDescriptorUrl()
   {
-    assertThrows(
+    final var ex = assertThrows(
         ParseException.class,
         () -> {
-          // configure parser with non existent desc file
-          final var decoder = new 
FileBasedProtobufBytesDecoder("file:/nonexist.desc", "BadName");
-          decoder.initDescriptor();
+          final var ignored = new 
FileBasedProtobufBytesDecoder("file:/nonexist.desc", "BadName");

Review Comment:
   ## Unread local variable
   
   Variable 'FileBasedProtobufBytesDecoder ignored' is never read.
   
   [Show more 
details](https://github.com/apache/druid/security/code-scanning/10174)



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org