Change DEFAULT_BUFFER_SIZE to be visible for classes in same package

Author: sarahchen6

utils/socket-utils/src/main/java17/datadog/common/socket/TunnelingJdkSocket.java

@@ -35,10 +35,10 @@ final class TunnelingJdkSocket extends Socket {
   private boolean shutOut;
   private boolean closed;
 
-  // Indicate that the buffer size is not set by initializing to -1
+  protected static final int DEFAULT_BUFFER_SIZE = 8192;
+  // Initial buffer sizes to -1, meaning not set
   private int sendBufferSize = -1;
   private int receiveBufferSize = -1;
-  static final int DEFAULT_BUFFER_SIZE = 8192;
 
   TunnelingJdkSocket(final Path path) {
     this.unixSocketAddress = UnixDomainSocketAddress.of(path);
@@ -142,7 +142,7 @@ public int getSendBufferSize() throws SocketException {
       throw new SocketException("Socket is closed");
     }
     if (sendBufferSize == -1) {
-      return defaultBufferSize;
+      return DEFAULT_BUFFER_SIZE;
     }
     return sendBufferSize;
   }
@@ -169,7 +169,7 @@ public int getReceiveBufferSize() throws SocketException {
       throw new SocketException("Socket is closed");
     }
     if (receiveBufferSize == -1) {
-      return defaultBufferSize;
+      return DEFAULT_BUFFER_SIZE;
     }
     return receiveBufferSize;
   }
@@ -179,15 +179,11 @@ public int getStreamBufferSize() throws SocketException {
       throw new SocketException("Socket is closed");
     }
     if (sendBufferSize == -1 && receiveBufferSize == -1) {
-      return defaultBufferSize;
+      return DEFAULT_BUFFER_SIZE;
     }
     return Math.max(sendBufferSize, receiveBufferSize);
   }
 
-  public int getDefaultBufferSize() {
-    return defaultBufferSize;
-  }
-
   @Override
   public InputStream getInputStream() throws IOException {
     if (isClosed()) {

utils/socket-utils/src/test/java/datadog/common/socket/TunnelingJdkSocketTest.java

@@ -88,12 +88,11 @@ public void testBufferSizes() throws Exception {
     startServer(socketAddress);
     TunnelingJdkSocket clientSocket = createClient(socketPath);
 
-    int defaultBufferSize = clientSocket.getDefaultBufferSize();
-    assertEquals(defaultBufferSize, clientSocket.getSendBufferSize());
-    assertEquals(defaultBufferSize, clientSocket.getReceiveBufferSize());
-    assertEquals(defaultBufferSize, clientSocket.getStreamBufferSize());
+    assertEquals(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE, clientSocket.getSendBufferSize());
+    assertEquals(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE, clientSocket.getReceiveBufferSize());
+    assertEquals(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE, clientSocket.getStreamBufferSize());
 
-    int newBufferSize = defaultBufferSize / 2;
+    int newBufferSize = TunnelingJdkSocket.DEFAULT_BUFFER_SIZE / 2;
     clientSocket.setSendBufferSize(newBufferSize);
     clientSocket.setReceiveBufferSize(newBufferSize / 2);
     assertEquals(newBufferSize, clientSocket.getSendBufferSize());
@@ -107,8 +106,12 @@ public void testBufferSizes() throws Exception {
         IllegalArgumentException.class, () -> clientSocket.setReceiveBufferSize(invalidBufferSize));
 
     clientSocket.close();
-    assertThrows(SocketException.class, () -> clientSocket.setSendBufferSize(defaultBufferSize));
-    assertThrows(SocketException.class, () -> clientSocket.setReceiveBufferSize(defaultBufferSize));
+    assertThrows(
+        SocketException.class,
+        () -> clientSocket.setSendBufferSize(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE));
+    assertThrows(
+        SocketException.class,
+        () -> clientSocket.setReceiveBufferSize(TunnelingJdkSocket.DEFAULT_BUFFER_SIZE));
     assertThrows(SocketException.class, () -> clientSocket.getSendBufferSize());
     assertThrows(SocketException.class, () -> clientSocket.getReceiveBufferSize());
     assertThrows(SocketException.class, () -> clientSocket.getStreamBufferSize());