From 067f27416c5d8e2bb6ec00ca1073d8ad19075cc4 Mon Sep 17 00:00:00 2001 From: streamnativebot Date: Thu, 8 Aug 2024 13:41:03 +0000 Subject: [PATCH 1/4] "Created by snbot" --- amqp-client-auth/pom.xml | 2 +- amqp-impl/pom.xml | 2 +- pom.xml | 69 +++++++++++------------------------ tests-qpid-jms-client/pom.xml | 2 +- tests/pom.xml | 2 +- 5 files changed, 26 insertions(+), 51 deletions(-) diff --git a/amqp-client-auth/pom.xml b/amqp-client-auth/pom.xml index 62f62c0c..acfd8b55 100644 --- a/amqp-client-auth/pom.xml +++ b/amqp-client-auth/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-amqp-parent io.streamnative.pulsar.handlers - 3.3.0-SNAPSHOT + 3.4.0.ursa-SNAPSHOT 4.0.0 diff --git a/amqp-impl/pom.xml b/amqp-impl/pom.xml index 59372f15..99ce0374 100644 --- a/amqp-impl/pom.xml +++ b/amqp-impl/pom.xml @@ -22,7 +22,7 @@ io.streamnative.pulsar.handlers pulsar-protocol-handler-amqp-parent - 3.3.0-SNAPSHOT + 3.4.0.ursa-SNAPSHOT pulsar-protocol-handler-amqp diff --git a/pom.xml b/pom.xml index a60853bd..8e6b74dd 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - + - - + org.apache apache 18 4.0.0 - pom - io.streamnative.pulsar.handlers pulsar-protocol-handler-amqp-parent - 3.3.0-SNAPSHOT + 3.4.0.ursa-SNAPSHOT StreamNative :: Pulsar Protocol Handler :: AoP Parent Parent for AMQP on Pulsar implemented using Pulsar Protocol Handler. - true 17 17 ${maven.compiler.target} - - 3.4.0-SNAPSHOT + 3.4.0.ursa-SNAPSHOT 8.0.0 5.8.0 - 6.4.0 1.1.1 @@ -51,7 +43,6 @@ 6.14.3 4.2.0 3.15.0 - 3.1.8 1.4.9 @@ -63,7 +54,6 @@ 8.37 4.2.2 - Apache License, Version 2.0 @@ -71,18 +61,15 @@ repo - amqp-impl tests tests-qpid-jms-client amqp-client-auth - - io.streamnative pulsar @@ -90,59 +77,49 @@ pom import - io.streamnative pulsar-broker ${pulsar.version} - io.streamnative pulsar-broker ${pulsar.version} test-jar - io.streamnative testmocks ${pulsar.version} - com.rabbitmq amqp-client ${rabbitmq.version} - org.apache.qpid qpid-client ${qpid-client-version} - org.apache.geronimo.specs geronimo-jms_1.1_spec ${geronimo-jms-version} - org.apache.qpid qpid-test-utils ${qpid-protocol-plugin.version} - com.github.spotbugs spotbugs-annotations ${spotbugs-annotations.version} - - @@ -151,19 +128,16 @@ pulsar-broker provided - org.projectlombok lombok provided - com.github.spotbugs spotbugs-annotations provided - io.streamnative @@ -171,37 +145,31 @@ test-jar test - io.streamnative testmocks test - org.testng testng test - org.mockito mockito-core test - org.awaitility awaitility test - org.assertj assertj-core test - junit @@ -209,9 +177,7 @@ 4.13.2 test - - @@ -260,7 +226,6 @@ resources/findbugsExclude.xml - maven-compiler-plugin ${maven-compiler-plugin.version} @@ -277,7 +242,6 @@ - maven-surefire-plugin ${maven-surefire-plugin.version} @@ -293,14 +257,12 @@ false - com.mycila license-maven-plugin ${license-maven-plugin.version}
resources/license.template
- LICENSE NOTICE @@ -330,7 +292,6 @@ - org.codehaus.mojo templating-maven-plugin @@ -344,7 +305,6 @@ - pl.project13.maven git-commit-id-plugin @@ -370,10 +330,8 @@ full - - central @@ -384,6 +342,23 @@ nexus-snapshot-repo https://s01.oss.sonatype.org/content/repositories/snapshots + + ossrh + https://s01.oss.sonatype.org/service/local/repositories/0/content + + + nexus-snapshot + https://s01.oss.sonatype.org/content/repositories/snapshots + - + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + diff --git a/tests-qpid-jms-client/pom.xml b/tests-qpid-jms-client/pom.xml index 171dd72f..54eada49 100644 --- a/tests-qpid-jms-client/pom.xml +++ b/tests-qpid-jms-client/pom.xml @@ -20,7 +20,7 @@ io.streamnative.pulsar.handlers pulsar-protocol-handler-amqp-parent - 3.3.0-SNAPSHOT + 3.4.0.ursa-SNAPSHOT 4.0.0 diff --git a/tests/pom.xml b/tests/pom.xml index 7c65723a..bbc1aa55 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -22,7 +22,7 @@ io.streamnative.pulsar.handlers pulsar-protocol-handler-amqp-parent - 3.3.0-SNAPSHOT + 3.4.0.ursa-SNAPSHOT io.streamnative.pulsar.handlers From 449f0529f573978941a604d90aa12eb39c72f3f4 Mon Sep 17 00:00:00 2001 From: "gaoran_10@126.com" Date: Fri, 9 Aug 2024 10:29:06 +0800 Subject: [PATCH 2/4] fix methods changes --- .../handlers/amqp/test/AopProtocolHandlerTestBase.java | 7 +++++-- .../pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java | 7 +++++-- .../pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java | 8 ++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/amqp-impl/src/test/java/io/streamnative/pulsar/handlers/amqp/test/AopProtocolHandlerTestBase.java b/amqp-impl/src/test/java/io/streamnative/pulsar/handlers/amqp/test/AopProtocolHandlerTestBase.java index a915fba7..f77118d3 100644 --- a/amqp-impl/src/test/java/io/streamnative/pulsar/handlers/amqp/test/AopProtocolHandlerTestBase.java +++ b/amqp-impl/src/test/java/io/streamnative/pulsar/handlers/amqp/test/AopProtocolHandlerTestBase.java @@ -20,6 +20,7 @@ import com.google.common.collect.Sets; import com.google.common.util.concurrent.MoreExecutors; import io.netty.channel.EventLoopGroup; +import io.opentelemetry.api.OpenTelemetry; import io.streamnative.pulsar.handlers.amqp.AmqpServiceConfiguration; import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; @@ -153,8 +154,10 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception { doReturn(mockBookKeeperClientFactory).when(pulsar).newBookKeeperClientFactory(); MockZooKeeperSession mockZooKeeperSession = MockZooKeeperSession.newInstance(mockZooKeeper); - doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createLocalMetadataStore(any()); - doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createConfigurationMetadataStore(any()); + doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createLocalMetadataStore( + any(), OpenTelemetry.noop()); + doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createConfigurationMetadataStore( + any(), OpenTelemetry.noop()); Supplier namespaceServiceSupplier = () -> spy(new NamespaceService(pulsar)); doReturn(namespaceServiceSupplier).when(pulsar).getNamespaceServiceProvider(); diff --git a/tests-qpid-jms-client/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java b/tests-qpid-jms-client/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java index 4592a2ce..4360a621 100644 --- a/tests-qpid-jms-client/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java +++ b/tests-qpid-jms-client/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java @@ -16,6 +16,7 @@ import com.google.common.collect.Sets; import com.google.common.util.concurrent.MoreExecutors; import io.netty.channel.EventLoopGroup; +import io.opentelemetry.api.OpenTelemetry; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.client.BookKeeper; @@ -280,8 +281,10 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception { doReturn(mockBookKeeperClientFactory).when(pulsar).newBookKeeperClientFactory(); MockZooKeeperSession mockZooKeeperSession = MockZooKeeperSession.newInstance(mockZooKeeper); - doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createLocalMetadataStore(any()); - doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createConfigurationMetadataStore(any()); + doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar) + .createLocalMetadataStore(any(), OpenTelemetry.noop()); + doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar) + .createConfigurationMetadataStore(any(), OpenTelemetry.noop()); Supplier namespaceServiceSupplier = () -> spy(new NamespaceService(pulsar)); doReturn(namespaceServiceSupplier).when(pulsar).getNamespaceServiceProvider(); diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java index f5fa1d85..ac5b7099 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java @@ -35,6 +35,8 @@ import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.function.Supplier; + +import io.opentelemetry.api.OpenTelemetry; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.client.BookKeeper; @@ -307,8 +309,10 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception { doReturn(mockBookKeeperClientFactory).when(pulsar).newBookKeeperClientFactory(); MockZooKeeperSession mockZooKeeperSession = MockZooKeeperSession.newInstance(mockZooKeeper); - doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createLocalMetadataStore(any()); - doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createConfigurationMetadataStore(any()); + doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar) + .createLocalMetadataStore(any(), OpenTelemetry.noop()); + doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar) + .createConfigurationMetadataStore(any(), OpenTelemetry.noop()); Supplier namespaceServiceSupplier = () -> spy(new NamespaceService(pulsar)); doReturn(namespaceServiceSupplier).when(pulsar).getNamespaceServiceProvider(); From 89dbf0b8884e9979419765c2626be29ecdcaa79c Mon Sep 17 00:00:00 2001 From: "gaoran_10@126.com" Date: Fri, 9 Aug 2024 11:06:03 +0800 Subject: [PATCH 3/4] fix --- .../handlers/amqp/test/AopProtocolHandlerTestBase.java | 7 ++----- .../pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java | 7 ++----- .../pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/amqp-impl/src/test/java/io/streamnative/pulsar/handlers/amqp/test/AopProtocolHandlerTestBase.java b/amqp-impl/src/test/java/io/streamnative/pulsar/handlers/amqp/test/AopProtocolHandlerTestBase.java index f77118d3..3814fed8 100644 --- a/amqp-impl/src/test/java/io/streamnative/pulsar/handlers/amqp/test/AopProtocolHandlerTestBase.java +++ b/amqp-impl/src/test/java/io/streamnative/pulsar/handlers/amqp/test/AopProtocolHandlerTestBase.java @@ -20,7 +20,6 @@ import com.google.common.collect.Sets; import com.google.common.util.concurrent.MoreExecutors; import io.netty.channel.EventLoopGroup; -import io.opentelemetry.api.OpenTelemetry; import io.streamnative.pulsar.handlers.amqp.AmqpServiceConfiguration; import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; @@ -154,10 +153,8 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception { doReturn(mockBookKeeperClientFactory).when(pulsar).newBookKeeperClientFactory(); MockZooKeeperSession mockZooKeeperSession = MockZooKeeperSession.newInstance(mockZooKeeper); - doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createLocalMetadataStore( - any(), OpenTelemetry.noop()); - doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createConfigurationMetadataStore( - any(), OpenTelemetry.noop()); + doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createLocalMetadataStore(any(), any()); + doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createConfigurationMetadataStore(any(), any()); Supplier namespaceServiceSupplier = () -> spy(new NamespaceService(pulsar)); doReturn(namespaceServiceSupplier).when(pulsar).getNamespaceServiceProvider(); diff --git a/tests-qpid-jms-client/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java b/tests-qpid-jms-client/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java index 4360a621..3dc79570 100644 --- a/tests-qpid-jms-client/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java +++ b/tests-qpid-jms-client/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java @@ -16,7 +16,6 @@ import com.google.common.collect.Sets; import com.google.common.util.concurrent.MoreExecutors; import io.netty.channel.EventLoopGroup; -import io.opentelemetry.api.OpenTelemetry; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.client.BookKeeper; @@ -281,10 +280,8 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception { doReturn(mockBookKeeperClientFactory).when(pulsar).newBookKeeperClientFactory(); MockZooKeeperSession mockZooKeeperSession = MockZooKeeperSession.newInstance(mockZooKeeper); - doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar) - .createLocalMetadataStore(any(), OpenTelemetry.noop()); - doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar) - .createConfigurationMetadataStore(any(), OpenTelemetry.noop()); + doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createLocalMetadataStore(any(), any()); + doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createConfigurationMetadataStore(any(), any()); Supplier namespaceServiceSupplier = () -> spy(new NamespaceService(pulsar)); doReturn(namespaceServiceSupplier).when(pulsar).getNamespaceServiceProvider(); diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java index ac5b7099..775424ab 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java @@ -36,7 +36,6 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import io.opentelemetry.api.OpenTelemetry; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.client.BookKeeper; @@ -309,10 +308,8 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception { doReturn(mockBookKeeperClientFactory).when(pulsar).newBookKeeperClientFactory(); MockZooKeeperSession mockZooKeeperSession = MockZooKeeperSession.newInstance(mockZooKeeper); - doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar) - .createLocalMetadataStore(any(), OpenTelemetry.noop()); - doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar) - .createConfigurationMetadataStore(any(), OpenTelemetry.noop()); + doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createLocalMetadataStore(any(), any()); + doReturn(new ZKMetadataStore(mockZooKeeperSession)).when(pulsar).createConfigurationMetadataStore(any(), any()); Supplier namespaceServiceSupplier = () -> spy(new NamespaceService(pulsar)); doReturn(namespaceServiceSupplier).when(pulsar).getNamespaceServiceProvider(); From 20e22d055472874ac610b0b8ad6a7a82e12f0394 Mon Sep 17 00:00:00 2001 From: "gaoran_10@126.com" Date: Fri, 9 Aug 2024 11:14:53 +0800 Subject: [PATCH 4/4] fix --- .../pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java index 775424ab..55da5403 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java @@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.function.Supplier; - import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.client.BookKeeper;