optimize

Author: OmCheeLin

src/main/java/org/apache/skywalking/banyandb/v1/client/BanyanDBClient.java

@@ -193,7 +193,7 @@ public void connect() throws IOException {
                 String password = options.getPassword();
                 if (!"".equals(username) && !"".equals(password)) {
                     interceptedChannel = ClientInterceptors.intercept(rawChannel,
-                            new AuthInterceptor(options.getUsername(), options.getPassword()));
+                            new AuthInterceptor(username, password));
                 }
                 // Ensure this.channel is assigned only once.
                 this.channel = interceptedChannel;

src/main/java/org/apache/skywalking/banyandb/v1/client/auth/AuthInterceptor.java

@@ -30,6 +30,11 @@ public class AuthInterceptor implements ClientInterceptor {
     private final String username;
     private final String password;
 
+    private static final Metadata.Key<String> USERNAME_KEY =
+            Metadata.Key.of("username", Metadata.ASCII_STRING_MARSHALLER);
+    private static final Metadata.Key<String> PASSWORD_KEY =
+            Metadata.Key.of("password", Metadata.ASCII_STRING_MARSHALLER);
+
     public AuthInterceptor(String username, String password) {
         this.username = username;
         this.password = password;
@@ -45,11 +50,8 @@ public <REQ_T, RESP_T> ClientCall<REQ_T, RESP_T> interceptCall(
                 next.newCall(method, callOptions)) {
             @Override
             public void start(Listener<RESP_T> responseListener, Metadata headers) {
-                Metadata.Key<String> usernameKey = Metadata.Key.of("username", Metadata.ASCII_STRING_MARSHALLER);
-                Metadata.Key<String> passwordKey = Metadata.Key.of("password", Metadata.ASCII_STRING_MARSHALLER);
-
-                headers.put(usernameKey, username);
-                headers.put(passwordKey, password);
+                headers.put(USERNAME_KEY, username);
+                headers.put(PASSWORD_KEY, password);
 
                 super.start(responseListener, headers);
             }

…banyandb/v1/client/BanyanDBAuthTest.java …nyandb/v1/client/ITBanyanDBAuthTest.javasrc/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBAuthTest.java renamed to src/test/java/org/apache/skywalking/banyandb/v1/client/ITBanyanDBAuthTest.java src/test/java/org/apache/skywalking/banyandb/v1/client/BanyanDBAuthTest.java renamed to src/test/java/org/apache/skywalking/banyandb/v1/client/ITBanyanDBAuthTest.java

@@ -33,14 +33,13 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.PosixFilePermissions;
-import java.util.Base64;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertThrows;
 
-public class BanyanDBAuthTest {
+public class ITBanyanDBAuthTest {
     private static final String REGISTRY = "ghcr.io";
     private static final String IMAGE_NAME = "apache/skywalking-banyandb";
     private static final String TAG = "42ec9df7457868926eb80157b36355d94fcd6bba";
@@ -53,7 +52,7 @@ public class BanyanDBAuthTest {
     @Rule
     public GenericContainer<?> banyanDB;
 
-    public BanyanDBAuthTest() throws Exception {
+    public ITBanyanDBAuthTest() throws Exception {
         // Step 1: prepare config file with 0600 permissions
         Path tempConfigPath = Files.createTempFile("bydb_server_config", ".yaml");
         Files.write(tempConfigPath, Files.readAllBytes(
@@ -68,14 +67,10 @@ public BanyanDBAuthTest() throws Exception {
                         "/tmp/bydb_server_config.yaml"
                 )
                 .withCommand("standalone",
-                        "--auth-config-file", "/tmp/bydb_server_config.yaml",
-                        "--enable-health-auth", "true"
+                        "--auth-config-file", "/tmp/bydb_server_config.yaml"
                 )
                 .withExposedPorts(GRPC_PORT, HTTP_PORT)
-                .waitingFor(Wait.forHttp("/api/healthz")
-                        .withHeader("Authorization",
-                                "Basic " + Base64.getEncoder().encodeToString("admin:123456".getBytes()))
-                        .forPort(HTTP_PORT));
+                .waitingFor(Wait.forHttp("/api/healthz").forPort(HTTP_PORT));
     }
 
     @Test