You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by gu...@apache.org on 2020/12/15 06:19:51 UTC
[pulsar-manager] branch master updated: Issue 359: Upgrade BKVM to
3.0.0 (#360)
This is an automated email from the ASF dual-hosted git repository.
guangning pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-manager.git
The following commit(s) were added to refs/heads/master by this push:
new 599fd20 Issue 359: Upgrade BKVM to 3.0.0 (#360)
599fd20 is described below
commit 599fd207357db36f9dd25ac89e905ba1a258ccd1
Author: Diana Clementi <di...@gmail.com>
AuthorDate: Tue Dec 15 07:16:14 2020 +0100
Issue 359: Upgrade BKVM to 3.0.0 (#360)
* Issue 359: Upgrade BKVM to 3.0.0
* Issue 359: Upgrade BKVM to 3.0.0 - fix pulsar broker version
---
build.gradle | 2 +-
gradle.properties | 7 +++----
.../pulsar/manager/service/TopicsServiceImplTest.java | 15 +++++++++------
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/build.gradle b/build.gradle
index 786039c..af17e01 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,7 +127,7 @@ dependencies {
compile group: 'org.apache.pulsar', name: 'pulsar-client-auth-sasl', version: pulsarVersion
compile group: 'io.springfox', name: 'springfox-swagger2', version: swagger2Version
compile group: 'io.springfox', name: 'springfox-swagger-ui', version: swaggeruiVersion
- compile group: 'org.apache.pulsar', name: 'pulsar-broker', version: brokerVersion
+ compile group: 'org.apache.pulsar', name: 'pulsar-broker', version: pulsarVersion
compile group: 'commons-validator', name: 'commons-validator', version: commonsValidatorVersion
compile (group: 'org.bkvm', name: 'bkvm', version: bkvmVersion, ext: 'war', classifier:'war-no-libs') {
exclude group: 'org.slf4j', module: 'slf4j-jdk14'
diff --git a/gradle.properties b/gradle.properties
index 7ac55c5..c66f4d7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,16 +10,15 @@ lombokVersion=1.18.10
pageHelperVersion=1.2.4
mockitoVersion=2.8.47
guavaVersion=21.0
-pulsarVersion=2.5.2
+pulsarVersion=2.7.0
swagger2Version=2.9.2
swaggeruiVersion=2.9.2
apiMockitoVersion=1.7.1
mockitoJunit4Version=1.7.1
gsonVersion=2.8.2
postgresqlVersion=42.2.5
-herddbVersion=0.19.0
-brokerVersion=2.4.1
+herddbVersion=0.22.0
commonsValidatorVersion=1.6
-bkvmVersion=2.0.0
+bkvmVersion=3.0.0
tomcatVersion=8.5.31
jerseyVersion=2.26
diff --git a/src/test/java/org/apache/pulsar/manager/service/TopicsServiceImplTest.java b/src/test/java/org/apache/pulsar/manager/service/TopicsServiceImplTest.java
index e998d07..bdeef37 100644
--- a/src/test/java/org/apache/pulsar/manager/service/TopicsServiceImplTest.java
+++ b/src/test/java/org/apache/pulsar/manager/service/TopicsServiceImplTest.java
@@ -39,13 +39,14 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import org.apache.pulsar.common.api.proto.PulsarApi;
@RunWith(SpringRunner.class)
@SpringBootTest(
- classes = {
- PulsarManagerApplication.class,
- HerdDBTestProfile.class
- }
+ classes = {
+ PulsarManagerApplication.class,
+ HerdDBTestProfile.class
+ }
)
@ActiveProfiles("test")
public class TopicsServiceImplTest {
@@ -117,7 +118,7 @@ public class TopicsServiceImplTest {
topicMap.put("partitions", "0");
topics.add(topicMap);
- List<Map<String, Object>> topicsList = topicsService.getTopicsStatsList(
+ List<Map<String, Object>> topicsList = topicsService.getTopicsStatsList(
environment, tenant, namespace, policy, topics);
topicsList.forEach((t) -> {
Assert.assertEquals(0, t.get("partitions"));
@@ -133,7 +134,8 @@ public class TopicsServiceImplTest {
public void peekMessagesTest() throws PulsarAdminException {
Mockito.when(pulsarAdminService.topics("http://localhost:8080")).thenReturn(topics);
List<Message<byte[]>> messages = new ArrayList<>();
- messages.add(new MessageImpl<byte[]>("persistent://public/default/test", "1:1", Maps.newTreeMap(), "test".getBytes(), Schema.BYTES));
+ messages.add(new MessageImpl<>("persistent://public/default/test", "1:1", Maps.newTreeMap(), "test".getBytes(),
+ Schema.BYTES, PulsarApi.MessageMetadata.newBuilder()));
Mockito.when(topics.peekMessages("persistent://public/default/test", "sub-1", 1)).thenReturn(messages);
List<Map<String, Object>> result = topicsService.peekMessages(
@@ -149,4 +151,5 @@ public class TopicsServiceImplTest {
Assert.assertEquals(new String("test".getBytes()), new String((byte[]) message.get("data")));
});
}
+
}