oracle · anders-swanson · Sep 3, 2024 · Sep 3, 2024
diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/README.md b/database/spring-cloud-stream-binder-oracle-txeventq/README.md
@@ -29,7 +29,7 @@ mvn integration-test
 To use in an application project, add the following dependencies apart from regular spring-cloud-stream project dependencies:
 ```
 <dependency>
-	<groupId>com.oracle.database.cstream</groupId>
+	<groupId>com.oracle.database.spring.cloud.stream.binder</groupId>
 	<artifactId>spring-cloud-stream-binder-oracle-txeventq</artifactId>
 	<version>0.9.0</version>
 </dependency>

diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/pom.xml b/database/spring-cloud-stream-binder-oracle-txeventq/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.oracle.database.cstream</groupId>
+    <groupId>com.oracle.database.spring.cloud.stream.binder</groupId>
     <artifactId>spring-cloud-stream-binder-oracle-txeventq</artifactId>
     <version>0.9.0</version>
     <packaging>jar</packaging>

diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/samples/MultipleConsumerTest.java b/database/spring-cloud-stream-binder-oracle-txeventq/samples/MultipleConsumerTest.java
@@ -1,4 +1,4 @@
-package com.oracle.cstream;
+package com.oracle.database.spring.cloud.stream.binder;
 
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -11,7 +11,7 @@
 public class MultipleConsumerTest {
 	int y = 0;
 	public static void main(String[] args) {
-		SpringApplication.run(MultipleConsumerTest.class, 
+		SpringApplication.run(MultipleConsumerTest.class,
 				"--spring.datasource.url=jdbc:oracle:thin:@cdb1_pdb1_wallet",
 				"--spring.datasource.oracleucp.connection-properties.oracle.net.wallet_location=C:/tmp/wallet",
 				"--spring.datasource.oracleucp.connection-properties.oracle.net.tns_admin=C:/tmp/wallet",
@@ -27,19 +27,19 @@ public static void main(String[] args) {
 //				"--spring.cloud.stream.bindings.pd-out-0.producer.requiredGroups=t1",
 //				"--spring.cloud.stream.bindings.pd-out-0.producer.poller.fixedDelay=100"); /**/
 	}
-	
-	
+
+
 	@Bean
 	public Consumer<String> cs1() {
 		return to -> System.out.println("Received for cs1: " + to);
 	}
-	
+
 	@Bean
 	public Consumer<String> cs2() {
 		return to -> System.out.println("Received for cs2: " + to);
 	}
-	
-	
+
+
 //	@Bean
 //	public Supplier<String> pd() {
 //		return () -> {

diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/scripts/deploy b/database/spring-cloud-stream-binder-oracle-txeventq/scripts/deploy
@@ -48,5 +48,5 @@ echo "Successfully deployed project to ${REPOSITORY_URL}/${REPOSITORY_NAME}"
 PACKAGES="$(mvn -Dexec.executable='echo' -Dexec.args='${project.artifactId}' exec:exec -q)"
 printf "The following artifacts have been created for upload:\n\n"
 for PACKAGE in $PACKAGES; do
-  echo "com.oracle.cloud.spring:${PACKAGE}:${VERSION}"
+  echo "com.oracle.database.spring.cloud.stream.binder:${PACKAGE}:${VERSION}"
 done
diff --git a/...eam-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/README.md b/...eam-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/README.md
@@ -6,11 +6,11 @@ Spring Cloud Stream exposes a [functional messaging API](https://docs.spring.io/
 
 ### WordSupplier: Message Producer
 
-The [WordSupplier](src/main/java/com/oracle/cstream/sample/WordSupplier.java) class produces a series of words to a topic. Consumers may subscribe to this topic to review messages from the supplier.
+The [WordSupplier](src/main/java/com/oracle/database/spring/cloud/stream/binder/sample/WordSupplier.java) class produces a series of words to a topic. Consumers may subscribe to this topic to review messages from the supplier.
 
 ### toUpperCase and stdoutConsumer
 
-Messages from the WordSupplier are piped through the [toUpperCase](src/main/java/com/oracle/cstream/sample/StreamConfiguration.java) functional interface to demonstrate stream processing. Finally, each message is consumed and printed to stdout by the `stdoutConsumer`.
+Messages from the WordSupplier are piped through the [toUpperCase](src/main/java/com/oracle/database/spring/cloud/stream/binder/sample/StreamConfiguration.java) functional interface to demonstrate stream processing. Finally, each message is consumed and printed to stdout by the `stdoutConsumer`.
 
 ### Running the tests
 

diff --git a/...ng-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/pom.xml b/...ng-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/pom.xml
@@ -3,7 +3,7 @@
     <!-- Copyright (c) 2024, Oracle and/or its affiliates. -->
     <!-- Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.oracle.database.cstream</groupId>
+    <groupId>com.oracle.database.spring.cloud.stream.binder</groupId>
     <artifactId>spring-cloud-stream-binder-txeventq-sample</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
@@ -52,7 +52,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.oracle.database.cstream</groupId>
+            <groupId>com.oracle.database.spring.cloud.stream.binder</groupId>
             <artifactId>spring-cloud-stream-binder-oracle-txeventq</artifactId>
             <version>${txeventq.streambinder.version}</version>
         </dependency>

diff --git a/...e/cstream/sample/StreamConfiguration.java → ...am/binder/sample/StreamConfiguration.java b/...e/cstream/sample/StreamConfiguration.java → ...am/binder/sample/StreamConfiguration.java
@@ -1,6 +1,6 @@
 // Copyright (c) 2024, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-package com.oracle.cstream.sample;
+package com.oracle.database.spring.cloud.stream.binder.sample;
 
 import java.util.function.Consumer;
 import java.util.function.Function;

diff --git a/...cle/cstream/sample/TxEventQSampleApp.java → ...ream/binder/sample/TxEventQSampleApp.java b/...cle/cstream/sample/TxEventQSampleApp.java → ...ream/binder/sample/TxEventQSampleApp.java
@@ -1,6 +1,6 @@
 // Copyright (c) 2024, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-package com.oracle.cstream.sample;
+package com.oracle.database.spring.cloud.stream.binder.sample;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...m/oracle/cstream/sample/WordSupplier.java → ...ud/stream/binder/sample/WordSupplier.java b/...m/oracle/cstream/sample/WordSupplier.java → ...ud/stream/binder/sample/WordSupplier.java
@@ -1,4 +1,4 @@
-package com.oracle.cstream.sample;
+package com.oracle.database.spring.cloud.stream.binder.sample;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/...cstream/sample/TxEventQSampleAppTest.java → .../binder/sample/TxEventQSampleAppTest.java b/...cstream/sample/TxEventQSampleAppTest.java → .../binder/sample/TxEventQSampleAppTest.java
@@ -1,6 +1,6 @@
 // Copyright (c) 2024, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-package com.oracle.cstream.sample;
+package com.oracle.database.spring.cloud.stream.binder.sample;
 
 import java.time.Duration;
 

diff --git a/...acle/cstream/JMSMessageChannelBinder.java → ...tream/binder/JMSMessageChannelBinder.java b/...acle/cstream/JMSMessageChannelBinder.java → ...tream/binder/JMSMessageChannelBinder.java
@@ -23,13 +23,18 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream;
+package com.oracle.database.spring.cloud.stream.binder;
 
-import com.oracle.cstream.config.*;
-import com.oracle.cstream.provisioning.JmsConsumerDestination;
-import com.oracle.cstream.provisioning.JmsProducerDestination;
-import com.oracle.cstream.utils.*;
+import com.oracle.database.spring.cloud.stream.binder.config.JmsConsumerProperties;
+import com.oracle.database.spring.cloud.stream.binder.config.JmsExtendedBindingProperties;
+import com.oracle.database.spring.cloud.stream.binder.config.JmsProducerProperties;
+import com.oracle.database.spring.cloud.stream.binder.provisioning.JmsConsumerDestination;
+import com.oracle.database.spring.cloud.stream.binder.provisioning.JmsProducerDestination;
 
+
+import com.oracle.database.spring.cloud.stream.binder.utils.DestinationNameResolver;
+import com.oracle.database.spring.cloud.stream.binder.utils.JmsMessageDrivenChannelAdapterFactory;
+import com.oracle.database.spring.cloud.stream.binder.utils.JmsSendingMessageHandlerFactory;
 import jakarta.jms.Connection;
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.Session;

diff --git a/...cle/cstream/TxEventQQueueProvisioner.java → ...ream/binder/TxEventQQueueProvisioner.java b/...cle/cstream/TxEventQQueueProvisioner.java → ...ream/binder/TxEventQQueueProvisioner.java
@@ -22,13 +22,13 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream;
+package com.oracle.database.spring.cloud.stream.binder;
 
-import com.oracle.cstream.config.JmsConsumerProperties;
-import com.oracle.cstream.config.JmsProducerProperties;
-import com.oracle.cstream.plsql.OracleDBUtils;
-import com.oracle.cstream.provisioning.JmsConsumerDestination;
-import com.oracle.cstream.provisioning.JmsProducerDestination;
+import com.oracle.database.spring.cloud.stream.binder.config.JmsConsumerProperties;
+import com.oracle.database.spring.cloud.stream.binder.config.JmsProducerProperties;
+import com.oracle.database.spring.cloud.stream.binder.plsql.OracleDBUtils;
+import com.oracle.database.spring.cloud.stream.binder.provisioning.JmsConsumerDestination;
+import com.oracle.database.spring.cloud.stream.binder.provisioning.JmsProducerDestination;
 import jakarta.jms.Connection;
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.JMSException;

diff --git a/...am/config/JmsBinderAutoConfiguration.java → ...er/config/JmsBinderAutoConfiguration.java b/...am/config/JmsBinderAutoConfiguration.java → ...er/config/JmsBinderAutoConfiguration.java
@@ -23,7 +23,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.config;
+package com.oracle.database.spring.cloud.stream.binder.config;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.stream.binder.Binder;

diff --git a/.../config/JmsBinderGlobalConfiguration.java → .../config/JmsBinderGlobalConfiguration.java b/.../config/JmsBinderGlobalConfiguration.java → .../config/JmsBinderGlobalConfiguration.java
@@ -22,10 +22,17 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.config;
-
-import com.oracle.cstream.JMSMessageChannelBinder;
-import com.oracle.cstream.utils.*;
+package com.oracle.database.spring.cloud.stream.binder.config;
+
+import com.oracle.database.spring.cloud.stream.binder.JMSMessageChannelBinder;
+import com.oracle.database.spring.cloud.stream.binder.utils.Base64UrlNamingStrategy;
+import com.oracle.database.spring.cloud.stream.binder.utils.DestinationNameResolver;
+import com.oracle.database.spring.cloud.stream.binder.utils.JmsMessageDrivenChannelAdapterFactory;
+import com.oracle.database.spring.cloud.stream.binder.utils.JmsSendingMessageHandlerFactory;
+import com.oracle.database.spring.cloud.stream.binder.utils.ListenerContainerFactory;
+import com.oracle.database.spring.cloud.stream.binder.utils.MessageRecoverer;
+import com.oracle.database.spring.cloud.stream.binder.utils.RepublishMessageRecoverer;
+import com.oracle.database.spring.cloud.stream.binder.utils.SpecCompliantJmsHeaderMapper;
 import jakarta.jms.ConnectionFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

diff --git a/.../cstream/config/JmsBindingProperties.java → ...m/binder/config/JmsBindingProperties.java b/.../cstream/config/JmsBindingProperties.java → ...m/binder/config/JmsBindingProperties.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.config;
+package com.oracle.database.spring.cloud.stream.binder.config;
 
 import org.springframework.cloud.stream.binder.BinderSpecificPropertiesProvider;
 

diff --git a/...cstream/config/JmsConsumerProperties.java → .../binder/config/JmsConsumerProperties.java b/...cstream/config/JmsConsumerProperties.java → .../binder/config/JmsConsumerProperties.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.config;
+package com.oracle.database.spring.cloud.stream.binder.config;
 
 public class JmsConsumerProperties {
     private static final String DEFAULT_DLQ_NAME = "Spring_Cloud_Stream_dlq";

diff --git a/.../config/JmsExtendedBindingProperties.java → .../config/JmsExtendedBindingProperties.java b/.../config/JmsExtendedBindingProperties.java → .../config/JmsExtendedBindingProperties.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.config;
+package com.oracle.database.spring.cloud.stream.binder.config;
 
 import java.util.Map;
 

diff --git a/...cstream/config/JmsProducerProperties.java → .../binder/config/JmsProducerProperties.java b/...cstream/config/JmsProducerProperties.java → .../binder/config/JmsProducerProperties.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.config;
+package com.oracle.database.spring.cloud.stream.binder.config;
 
 public class JmsProducerProperties {
     private String serializer = null;

diff --git a/...ream/config/TxEventQJmsConfiguration.java → ...nder/config/TxEventQJmsConfiguration.java b/...ream/config/TxEventQJmsConfiguration.java → ...nder/config/TxEventQJmsConfiguration.java
@@ -22,10 +22,10 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.config;
+package com.oracle.database.spring.cloud.stream.binder.config;
 
-import com.oracle.cstream.TxEventQQueueProvisioner;
-import com.oracle.cstream.plsql.OracleDBUtils;
+import com.oracle.database.spring.cloud.stream.binder.TxEventQQueueProvisioner;
+import com.oracle.database.spring.cloud.stream.binder.plsql.OracleDBUtils;
 
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.JMSException;

diff --git a/...m/oracle/cstream/plsql/OracleDBUtils.java → ...ud/stream/binder/plsql/OracleDBUtils.java b/...m/oracle/cstream/plsql/OracleDBUtils.java → ...ud/stream/binder/plsql/OracleDBUtils.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.plsql;
+package com.oracle.database.spring.cloud.stream.binder.plsql;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;

diff --git a/.../provisioning/JmsConsumerDestination.java → .../provisioning/JmsConsumerDestination.java b/.../provisioning/JmsConsumerDestination.java → .../provisioning/JmsConsumerDestination.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.provisioning;
+package com.oracle.database.spring.cloud.stream.binder.provisioning;
 
 import org.springframework.cloud.stream.provisioning.ConsumerDestination;
 

diff --git a/.../provisioning/JmsProducerDestination.java → .../provisioning/JmsProducerDestination.java b/.../provisioning/JmsProducerDestination.java → .../provisioning/JmsProducerDestination.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.provisioning;
+package com.oracle.database.spring.cloud.stream.binder.provisioning;
 
 import jakarta.jms.JMSException;
 import jakarta.jms.Topic;

diff --git a/.../CustomSerializationMessageConverter.java → .../CustomSerializationMessageConverter.java b/.../CustomSerializationMessageConverter.java → .../CustomSerializationMessageConverter.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.serialize;
+package com.oracle.database.spring.cloud.stream.binder.serialize;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -66,8 +66,8 @@ public Object fromMessage(Message jmsMessage) throws JMSException {
         }
 
         if (!isInstanceOfDeserializer) {
-            logger.debug("The configured deserializer class is not an instance of 'com.oracle.cstream.serialize.DeSerializer'");
-            throw new IllegalArgumentException("The configured serializer class is not an instance of 'com.oracle.cstream.serialize.DeSerializer'");
+            logger.debug("The configured deserializer class is not an instance of 'com.oracle.database.spring.cloud.stream.binder.serialize.DeSerializer'");
+            throw new IllegalArgumentException("The configured serializer class is not an instance of 'com.oracle.database.spring.cloud.stream.binder.serialize.DeSerializer'");
         }
 
         Deserializer<?> s = null;

diff --git a/...racle/cstream/serialize/Deserializer.java → ...stream/binder/serialize/Deserializer.java b/...racle/cstream/serialize/Deserializer.java → ...stream/binder/serialize/Deserializer.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.serialize;
+package com.oracle.database.spring.cloud.stream.binder.serialize;
 
 public interface Deserializer<T> {
     T deserialize(byte[] bytes);

diff --git a/.../oracle/cstream/serialize/Serializer.java → ...d/stream/binder/serialize/Serializer.java b/.../oracle/cstream/serialize/Serializer.java → ...d/stream/binder/serialize/Serializer.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.serialize;
+package com.oracle.database.spring.cloud.stream.binder.serialize;
 
 public interface Serializer {
     byte[] serialize(Object data);

diff --git a/...stream/utils/AnonymousNamingStrategy.java → ...binder/utils/AnonymousNamingStrategy.java b/...stream/utils/AnonymousNamingStrategy.java → ...binder/utils/AnonymousNamingStrategy.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.utils;
+package com.oracle.database.spring.cloud.stream.binder.utils;
 
 public interface AnonymousNamingStrategy {
 

diff --git a/...stream/utils/Base64UrlNamingStrategy.java → ...binder/utils/Base64UrlNamingStrategy.java b/...stream/utils/Base64UrlNamingStrategy.java → ...binder/utils/Base64UrlNamingStrategy.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.utils;
+package com.oracle.database.spring.cloud.stream.binder.utils;
 
 import java.nio.ByteBuffer;
 import java.util.Base64;

diff --git a/...stream/utils/DestinationNameResolver.java → ...binder/utils/DestinationNameResolver.java b/...stream/utils/DestinationNameResolver.java → ...binder/utils/DestinationNameResolver.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.utils;
+package com.oracle.database.spring.cloud.stream.binder.utils;
 
 import org.springframework.util.StringUtils;
 

diff --git a/...utils/JmsMessageDrivenChannelAdapter.java → ...utils/JmsMessageDrivenChannelAdapter.java b/...utils/JmsMessageDrivenChannelAdapter.java → ...utils/JmsMessageDrivenChannelAdapter.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.utils;
+package com.oracle.database.spring.cloud.stream.binder.utils;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

diff --git a/...msMessageDrivenChannelAdapterFactory.java → ...msMessageDrivenChannelAdapterFactory.java b/...msMessageDrivenChannelAdapterFactory.java → ...msMessageDrivenChannelAdapterFactory.java
@@ -22,10 +22,10 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.utils;
+package com.oracle.database.spring.cloud.stream.binder.utils;
 
-import com.oracle.cstream.config.JmsConsumerProperties;
-import com.oracle.cstream.serialize.CustomSerializationMessageConverter;
+import com.oracle.database.spring.cloud.stream.binder.config.JmsConsumerProperties;
+import com.oracle.database.spring.cloud.stream.binder.serialize.CustomSerializationMessageConverter;
 
 import jakarta.jms.BytesMessage;
 import jakarta.jms.Destination;

diff --git a/...tils/JmsSendingMessageHandlerFactory.java → ...tils/JmsSendingMessageHandlerFactory.java b/...tils/JmsSendingMessageHandlerFactory.java → ...tils/JmsSendingMessageHandlerFactory.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.utils;
+package com.oracle.database.spring.cloud.stream.binder.utils;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;

diff --git a/...tream/utils/ListenerContainerFactory.java → ...inder/utils/ListenerContainerFactory.java b/...tream/utils/ListenerContainerFactory.java → ...inder/utils/ListenerContainerFactory.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.utils;
+package com.oracle.database.spring.cloud.stream.binder.utils;
 
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.Destination;

diff --git a/...racle/cstream/utils/MessageRecoverer.java → ...stream/binder/utils/MessageRecoverer.java b/...racle/cstream/utils/MessageRecoverer.java → ...stream/binder/utils/MessageRecoverer.java
@@ -22,7 +22,7 @@
  * limitations under the License.
  */
 
-package com.oracle.cstream.utils;
+package com.oracle.database.spring.cloud.stream.binder.utils;
 
 import jakarta.jms.Message;