This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.10 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 7b1a81dae0fa0225165f86a8d12d2a7d34f32aed Author: penghui <[email protected]> AuthorDate: Mon Aug 8 17:03:47 2022 +0800 Fix cherry-pick conflict --- .../broker/authentication/AuthenticationProviderBasicTest.java | 6 +++--- .../apache/pulsar/broker/auth/AuthorizationWithAuthDataTest.java | 3 ++- .../org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasicTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasicTest.java index fa72af76e8a..35822ea93f8 100644 --- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasicTest.java +++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderBasicTest.java @@ -22,8 +22,8 @@ import static org.testng.Assert.assertEquals; import com.google.common.io.Resources; import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.nio.file.FileSystems; import java.nio.file.Files; -import java.nio.file.Path; import java.util.Base64; import java.util.Properties; import javax.naming.AuthenticationException; @@ -34,7 +34,7 @@ import org.testng.annotations.Test; public class AuthenticationProviderBasicTest { private final String basicAuthConf = Resources.getResource("authentication/basic/.htpasswd").getPath(); - private final String basicAuthConfBase64 = Base64.getEncoder().encodeToString(Files.readAllBytes(Path.of(basicAuthConf))); + private final String basicAuthConfBase64 = Base64.getEncoder().encodeToString(Files.readAllBytes(FileSystems.getDefault().getPath(basicAuthConf))); public AuthenticationProviderBasicTest() throws IOException { } @@ -90,7 +90,7 @@ public class AuthenticationProviderBasicTest { @Test public void testReadData() throws Exception { - byte[] data = Files.readAllBytes(Path.of(basicAuthConf)); + byte[] data = Files.readAllBytes(FileSystems.getDefault().getPath(basicAuthConf)); String base64Data = Base64.getEncoder().encodeToString(data); // base64 format diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationWithAuthDataTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationWithAuthDataTest.java index ccb401f74b3..eb9ed006c13 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationWithAuthDataTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationWithAuthDataTest.java @@ -25,6 +25,7 @@ import io.jsonwebtoken.SignatureAlgorithm; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Base64; +import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.UUID; @@ -262,7 +263,7 @@ public class AuthorizationWithAuthDataTest extends MockedPulsarServiceBaseTest { @Test public void testAdmin() throws PulsarAdminException { admin.tenants().createTenant("test-tenant-1", - TenantInfo.builder().allowedClusters(Set.of(configClusterName)).build()); + TenantInfo.builder().allowedClusters(Collections.singleton(configClusterName)).build()); admin.namespaces().createNamespace("test-tenant-1/test-namespace-1"); String partitionedTopic = UUID.randomUUID().toString(); admin.topics().createPartitionedTopic(partitionedTopic,3); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java index d9ea5355dd3..95ed3efdafa 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java @@ -54,6 +54,7 @@ import org.apache.pulsar.client.api.PulsarClient; import org.apache.pulsar.client.api.Schema; import org.apache.pulsar.common.policies.data.TenantInfoImpl; import org.apache.zookeeper.ZooKeeper; +import org.awaitility.Awaitility; import org.testng.Assert; import org.testng.annotations.Test;
