-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into master-jakarta
- Loading branch information
Showing
18 changed files
with
159 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ | |
| <groupId>com.datastax.oss</groupId> | ||
| <artifactId>pulsar-jms-parent</artifactId> | ||
| <packaging>pom</packaging> | ||
| <version>6.0.1-SNAPSHOT</version> | ||
| <version>7.0.0-SNAPSHOT</version> | ||
| <name>DataStax Starlight for JMS</name> | ||
| <description>Implementation of the Java Messaging Service Client API around Apache Pulsar Java Client</description> | ||
| <url>https://github.com/datastax/pulsar-jms</url> | ||
|
|
@@ -439,7 +439,7 @@ limitations under the License.]]></inlineHeader> | |
| <connection>scm:git:[email protected]:datastax/pulsar-jms.git</connection> | ||
| <developerConnection>scm:git:[email protected]:datastax/pulsar-jms.git</developerConnection> | ||
| <url>https://github.com/datastax/pulsar-jms</url> | ||
| <tag>6.0.0</tag> | ||
| <tag>HEAD</tag> | ||
| </scm> | ||
| <developers> | ||
| <developer> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TemporaryDestinationsNonAdminTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * Copyright DataStax, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.datastax.oss.pulsar.jms; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
|
|
||
| import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; | ||
| import java.util.Map; | ||
| import javax.jms.Connection; | ||
| import javax.jms.Destination; | ||
| import javax.jms.JMSException; | ||
| import javax.jms.Message; | ||
| import javax.jms.MessageConsumer; | ||
| import javax.jms.MessageProducer; | ||
| import javax.jms.Session; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
|
||
| @Slf4j | ||
| public class TemporaryDestinationsNonAdminTest { | ||
|
|
||
| @RegisterExtension | ||
| static PulsarContainerExtension pulsarContainer = | ||
| new PulsarContainerExtension() | ||
| .withEnv("PULSAR_PREFIX_allowAutoTopicCreation", "true") | ||
| .withEnv("PULSAR_PREFIX_allowAutoTopicCreationType", "non-partitioned") | ||
| .withEnv("PULSAR_PREFIX_transactionCoordinatorEnabled", "false"); | ||
|
|
||
| @Test | ||
| public void allowTemporaryTopicWithoutAdminTest() throws Exception { | ||
| Map<String, Object> properties = getJmsProperties(); | ||
| properties.put("jms.allowTemporaryTopicWithoutAdmin", "true"); | ||
| useTemporaryDestinationNonAdminTest(properties, false); | ||
| } | ||
|
|
||
| @Test | ||
| public void forbidTemporaryTopicWithoutAdminTest() throws Exception { | ||
| Map<String, Object> properties = getJmsProperties(); | ||
| useTemporaryDestinationNonAdminTest(properties, true); | ||
| } | ||
|
|
||
| @NotNull | ||
| private static Map<String, Object> getJmsProperties() { | ||
| Map<String, Object> properties = pulsarContainer.buildJMSConnectionProperties(); | ||
| properties.put("jms.forceDeleteTemporaryDestinations", "true"); | ||
| properties.put("jms.usePulsarAdmin", "false"); | ||
| return properties; | ||
| } | ||
|
|
||
| private void useTemporaryDestinationNonAdminTest( | ||
| Map<String, Object> properties, boolean expectAdminErrors) throws Exception { | ||
|
|
||
| try (PulsarConnectionFactory factory = new PulsarConnectionFactory(properties)) { | ||
| try (Connection connection = factory.createConnection()) { | ||
| connection.start(); | ||
| try (Session session = connection.createSession()) { | ||
| if (expectAdminErrors) { | ||
| assertThrows(JMSException.class, session::createTemporaryTopic); | ||
| return; | ||
| } | ||
| Destination clientAddress = session.createTemporaryTopic(); | ||
| testProducerAndConsumer(session, clientAddress); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static void testProducerAndConsumer(Session session, Destination clientAddress) | ||
| throws JMSException { | ||
| try (MessageProducer producerClient = session.createProducer(clientAddress)) { | ||
| // subscribe on the temporary queue | ||
| try (MessageConsumer consumerClient = session.createConsumer(clientAddress)) { | ||
|
|
||
| String testMessage = "message"; | ||
| // produce a message | ||
| producerClient.send(session.createTextMessage(testMessage)); | ||
|
|
||
| // on the consumer receive the message | ||
| Message theResponse = consumerClient.receive(); | ||
| assertEquals(testMessage, theResponse.getBody(String.class)); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters