diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/README.md b/database/spring-cloud-stream-binder-oracle-txeventq/README.md index e36560ba..c304d753 100644 --- 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: ``` - com.oracle.database.cstream + com.oracle.database.spring.cloud.stream.binder spring-cloud-stream-binder-oracle-txeventq 0.9.0 diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/pom.xml b/database/spring-cloud-stream-binder-oracle-txeventq/pom.xml index 1de606a7..26e9363b 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/pom.xml +++ b/database/spring-cloud-stream-binder-oracle-txeventq/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - com.oracle.database.cstream + com.oracle.database.spring.cloud.stream.binder spring-cloud-stream-binder-oracle-txeventq 0.9.0 jar diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/samples/MultipleConsumerTest.java b/database/spring-cloud-stream-binder-oracle-txeventq/samples/MultipleConsumerTest.java index 306d0218..4f4116bf 100644 --- 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 cs1() { return to -> System.out.println("Received for cs1: " + to); } - + @Bean public Consumer cs2() { return to -> System.out.println("Received for cs2: " + to); } - - + + // @Bean // public Supplier pd() { // return () -> { diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/scripts/deploy b/database/spring-cloud-stream-binder-oracle-txeventq/scripts/deploy index 00b804e7..8f69ffaa 100755 --- 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/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/README.md b/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/README.md index fc8d26b8..0e620c17 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/README.md +++ b/database/spring-cloud-stream-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/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/pom.xml b/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/pom.xml index 3a4d9ba0..5f3a2862 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/pom.xml +++ b/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/pom.xml @@ -3,7 +3,7 @@ 4.0.0 - com.oracle.database.cstream + com.oracle.database.spring.cloud.stream.binder spring-cloud-stream-binder-txeventq-sample 1.0.0 jar @@ -52,7 +52,7 @@ - com.oracle.database.cstream + com.oracle.database.spring.cloud.stream.binder spring-cloud-stream-binder-oracle-txeventq ${txeventq.streambinder.version} diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/cstream/sample/StreamConfiguration.java b/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/database/spring/cloud/stream/binder/sample/StreamConfiguration.java similarity index 92% rename from database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/cstream/sample/StreamConfiguration.java rename to database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/database/spring/cloud/stream/binder/sample/StreamConfiguration.java index da1f1bec..ba9f336e 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/cstream/sample/StreamConfiguration.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/database/spring/cloud/stream/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/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/cstream/sample/TxEventQSampleApp.java b/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/database/spring/cloud/stream/binder/sample/TxEventQSampleApp.java similarity index 87% rename from database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/cstream/sample/TxEventQSampleApp.java rename to database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/database/spring/cloud/stream/binder/sample/TxEventQSampleApp.java index 15dd9249..1f2ef5e9 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/cstream/sample/TxEventQSampleApp.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/database/spring/cloud/stream/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/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/cstream/sample/WordSupplier.java b/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/database/spring/cloud/stream/binder/sample/WordSupplier.java similarity index 92% rename from database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/cstream/sample/WordSupplier.java rename to database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/database/spring/cloud/stream/binder/sample/WordSupplier.java index 897317b5..e8ce1fb9 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/cstream/sample/WordSupplier.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/main/java/com/oracle/database/spring/cloud/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/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/test/java/com/oracle/cstream/sample/TxEventQSampleAppTest.java b/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/test/java/com/oracle/database/spring/cloud/stream/binder/sample/TxEventQSampleAppTest.java similarity index 97% rename from database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/test/java/com/oracle/cstream/sample/TxEventQSampleAppTest.java rename to database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/test/java/com/oracle/database/spring/cloud/stream/binder/sample/TxEventQSampleAppTest.java index 88c53de3..cada39e3 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/test/java/com/oracle/cstream/sample/TxEventQSampleAppTest.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/src/test/java/com/oracle/database/spring/cloud/stream/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/JMSMessageChannelBinder.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/JMSMessageChannelBinder.java similarity index 91% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/JMSMessageChannelBinder.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/JMSMessageChannelBinder.java index 74734b63..ae9cfbd0 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/JMSMessageChannelBinder.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/TxEventQQueueProvisioner.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/TxEventQQueueProvisioner.java similarity index 95% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/TxEventQQueueProvisioner.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/TxEventQQueueProvisioner.java index ab2340c5..a5e14d7d 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/TxEventQQueueProvisioner.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsBinderAutoConfiguration.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/JmsBinderAutoConfiguration.java similarity index 95% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsBinderAutoConfiguration.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/JmsBinderAutoConfiguration.java index eececf22..129ada18 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsBinderAutoConfiguration.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsBinderGlobalConfiguration.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/JmsBinderGlobalConfiguration.java similarity index 84% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsBinderGlobalConfiguration.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/JmsBinderGlobalConfiguration.java index bfbb0265..0c82dec0 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsBinderGlobalConfiguration.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsBindingProperties.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/JmsBindingProperties.java similarity index 96% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsBindingProperties.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/JmsBindingProperties.java index d521bdba..ef459795 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsBindingProperties.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsConsumerProperties.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/JmsConsumerProperties.java similarity index 96% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsConsumerProperties.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/JmsConsumerProperties.java index 0aed39fb..5a9dca7b 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsConsumerProperties.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsExtendedBindingProperties.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/JmsExtendedBindingProperties.java similarity index 96% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsExtendedBindingProperties.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/JmsExtendedBindingProperties.java index 3f7ab306..846f9409 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsExtendedBindingProperties.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsProducerProperties.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/JmsProducerProperties.java similarity index 95% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsProducerProperties.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/JmsProducerProperties.java index 02726b2c..60bab761 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/JmsProducerProperties.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/TxEventQJmsConfiguration.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/TxEventQJmsConfiguration.java similarity index 94% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/TxEventQJmsConfiguration.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/config/TxEventQJmsConfiguration.java index d5e30eed..05380d5b 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/config/TxEventQJmsConfiguration.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/plsql/OracleDBUtils.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/plsql/OracleDBUtils.java similarity index 98% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/plsql/OracleDBUtils.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/plsql/OracleDBUtils.java index 50294f46..27693cf8 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/plsql/OracleDBUtils.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/provisioning/JmsConsumerDestination.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/provisioning/JmsConsumerDestination.java similarity index 95% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/provisioning/JmsConsumerDestination.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/provisioning/JmsConsumerDestination.java index a7319d39..85b19acc 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/provisioning/JmsConsumerDestination.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/provisioning/JmsProducerDestination.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/provisioning/JmsProducerDestination.java similarity index 97% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/provisioning/JmsProducerDestination.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/provisioning/JmsProducerDestination.java index 3b649978..18222203 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/provisioning/JmsProducerDestination.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/serialize/CustomSerializationMessageConverter.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/serialize/CustomSerializationMessageConverter.java similarity index 91% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/serialize/CustomSerializationMessageConverter.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/serialize/CustomSerializationMessageConverter.java index 0cb75440..480e1a3e 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/serialize/CustomSerializationMessageConverter.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/serialize/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/serialize/Deserializer.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/serialize/Deserializer.java similarity index 94% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/serialize/Deserializer.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/serialize/Deserializer.java index c6976ff5..61f6e6bd 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/serialize/Deserializer.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/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 deserialize(byte[] bytes); diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/serialize/Serializer.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/serialize/Serializer.java similarity index 94% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/serialize/Serializer.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/serialize/Serializer.java index d43cbf6a..b370f719 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/serialize/Serializer.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/AnonymousNamingStrategy.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/AnonymousNamingStrategy.java similarity index 94% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/AnonymousNamingStrategy.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/AnonymousNamingStrategy.java index 6baf93de..9697a8c9 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/AnonymousNamingStrategy.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/Base64UrlNamingStrategy.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/Base64UrlNamingStrategy.java similarity index 96% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/Base64UrlNamingStrategy.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/Base64UrlNamingStrategy.java index 5b65c2b8..30483fdb 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/Base64UrlNamingStrategy.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/DestinationNameResolver.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/DestinationNameResolver.java similarity index 95% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/DestinationNameResolver.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/DestinationNameResolver.java index 060131cd..ae2b9aef 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/DestinationNameResolver.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/JmsMessageDrivenChannelAdapter.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/JmsMessageDrivenChannelAdapter.java similarity index 98% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/JmsMessageDrivenChannelAdapter.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/JmsMessageDrivenChannelAdapter.java index 6d801e06..06867e91 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/JmsMessageDrivenChannelAdapter.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/JmsMessageDrivenChannelAdapterFactory.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/JmsMessageDrivenChannelAdapterFactory.java similarity index 97% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/JmsMessageDrivenChannelAdapterFactory.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/JmsMessageDrivenChannelAdapterFactory.java index 6ed0a695..ddd83aef 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/JmsMessageDrivenChannelAdapterFactory.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/JmsMessageDrivenChannelAdapterFactory.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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/JmsSendingMessageHandlerFactory.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/JmsSendingMessageHandlerFactory.java similarity index 98% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/JmsSendingMessageHandlerFactory.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/JmsSendingMessageHandlerFactory.java index 88b69b83..e286333b 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/JmsSendingMessageHandlerFactory.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/ListenerContainerFactory.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/ListenerContainerFactory.java similarity index 97% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/ListenerContainerFactory.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/ListenerContainerFactory.java index 258a4cb0..c01e7680 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/ListenerContainerFactory.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/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/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/MessageRecoverer.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/MessageRecoverer.java similarity index 95% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/MessageRecoverer.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/MessageRecoverer.java index 6a30147b..05fb031c 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/MessageRecoverer.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/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; diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/PartitionAwareJmsSendingMessageHandler.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/PartitionAwareJmsSendingMessageHandler.java similarity index 95% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/PartitionAwareJmsSendingMessageHandler.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/PartitionAwareJmsSendingMessageHandler.java index cf2c2997..7c0c0af5 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/PartitionAwareJmsSendingMessageHandler.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/PartitionAwareJmsSendingMessageHandler.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.Destination; import jakarta.jms.JMSException; @@ -39,7 +39,7 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.ErrorMessage; -import com.oracle.cstream.serialize.Serializer; +import com.oracle.database.spring.cloud.stream.binder.serialize.Serializer; public class PartitionAwareJmsSendingMessageHandler extends AbstractMessageHandler @@ -119,8 +119,8 @@ protected void jmsHandleMessageInternal(Message message) { } if (!isInstanceOfSerializer) { - logger.debug("The configured serializer class is not an instance of 'com.oracle.cstream.serialize.Serializer'"); - throw new IllegalArgumentException("The configured serializer class is not an instance of 'com.oracle.cstream.serialize.Serializer'"); + logger.debug("The configured serializer class is not an instance of 'com.oracle.database.spring.cloud.stream.binder.serialize.Serializer'"); + throw new IllegalArgumentException("The configured serializer class is not an instance of 'com.oracle.database.spring.cloud.stream.binder.serialize.Serializer'"); } Serializer s = null; diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/RepublishMessageRecoverer.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/RepublishMessageRecoverer.java similarity index 98% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/RepublishMessageRecoverer.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/RepublishMessageRecoverer.java index 31116ffc..43059f65 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/RepublishMessageRecoverer.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/RepublishMessageRecoverer.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.JMSException; import jakarta.jms.Message; diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/SpecCompliantJmsHeaderMapper.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/SpecCompliantJmsHeaderMapper.java similarity index 98% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/SpecCompliantJmsHeaderMapper.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/SpecCompliantJmsHeaderMapper.java index 732b93c3..960ef986 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/SpecCompliantJmsHeaderMapper.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/SpecCompliantJmsHeaderMapper.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; diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/TEQBatchMessageListener.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/TEQBatchMessageListener.java similarity index 98% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/TEQBatchMessageListener.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/TEQBatchMessageListener.java index cdd950a3..fe19d069 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/TEQBatchMessageListener.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/TEQBatchMessageListener.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.util.ArrayList; import java.util.List; @@ -47,7 +47,7 @@ import org.springframework.retry.RecoveryCallback; import org.springframework.retry.support.RetryTemplate; -import com.oracle.cstream.serialize.CustomSerializationMessageConverter; +import com.oracle.database.spring.cloud.stream.binder.serialize.CustomSerializationMessageConverter; import jakarta.jms.BytesMessage; import jakarta.jms.JMSException; diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/TEQBatchMessageListenerContainer.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/TEQBatchMessageListenerContainer.java similarity index 99% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/TEQBatchMessageListenerContainer.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/TEQBatchMessageListenerContainer.java index 1c77dfd0..c7defd4f 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/TEQBatchMessageListenerContainer.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/TEQBatchMessageListenerContainer.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.util.ArrayList; import java.util.Collections; diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/TEQMessageListenerContainer.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/TEQMessageListenerContainer.java similarity index 97% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/TEQMessageListenerContainer.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/TEQMessageListenerContainer.java index 025c4170..40464fe3 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/cstream/utils/TEQMessageListenerContainer.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/java/com/oracle/database/spring/cloud/stream/binder/utils/TEQMessageListenerContainer.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.jms.listener.DefaultMessageListenerContainer; import oracle.jakarta.jms.AQjmsConsumer; diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/resources/META-INF/spring.binders b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/resources/META-INF/spring.binders index 2f38604e..a3d0b78e 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/main/resources/META-INF/spring.binders +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/main/resources/META-INF/spring.binders @@ -1,2 +1,2 @@ txeventqjms=\ -com.oracle.cstream.config.TxEventQJmsConfiguration \ No newline at end of file +com.oracle.database.spring.cloud.stream.binder.config.TxEventQJmsConfiguration \ No newline at end of file diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/stream/TEQPartitionIT.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/database/spring/cloud/stream/binder/TEQPartitionIT.java similarity index 97% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/stream/TEQPartitionIT.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/database/spring/cloud/stream/binder/TEQPartitionIT.java index 3ed4a903..a68b4b68 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/stream/TEQPartitionIT.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/database/spring/cloud/stream/binder/TEQPartitionIT.java @@ -22,7 +22,7 @@ * limitations under the License. */ -package com.oracle.stream; +package com.oracle.database.spring.cloud.stream.binder; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -61,19 +61,17 @@ import org.springframework.util.Assert; import org.springframework.util.MimeTypeUtils; -import com.oracle.cstream.JMSMessageChannelBinder; -import com.oracle.cstream.TxEventQQueueProvisioner; -import com.oracle.cstream.config.JmsConsumerProperties; -import com.oracle.cstream.config.JmsProducerProperties; -import com.oracle.cstream.plsql.OracleDBUtils; -import com.oracle.cstream.utils.Base64UrlNamingStrategy; -import com.oracle.cstream.utils.DestinationNameResolver; -import com.oracle.cstream.utils.JmsMessageDrivenChannelAdapterFactory; -import com.oracle.cstream.utils.JmsSendingMessageHandlerFactory; -import com.oracle.cstream.utils.ListenerContainerFactory; -import com.oracle.cstream.utils.MessageRecoverer; -import com.oracle.cstream.utils.RepublishMessageRecoverer; -import com.oracle.cstream.utils.SpecCompliantJmsHeaderMapper; +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.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 nativetests.TestObject; diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/stream/TEQSpringBootIT.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/database/spring/cloud/stream/binder/TEQSpringBootIT.java similarity index 91% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/stream/TEQSpringBootIT.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/database/spring/cloud/stream/binder/TEQSpringBootIT.java index 29b283e3..57c70f7a 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/stream/TEQSpringBootIT.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/database/spring/cloud/stream/binder/TEQSpringBootIT.java @@ -1,9 +1,8 @@ -package com.oracle.stream; +package com.oracle.database.spring.cloud.stream.binder; import java.sql.SQLException; -import com.oracle.cstream.JMSMessageChannelBinder; -import com.oracle.cstream.config.TxEventQJmsConfiguration; +import com.oracle.database.spring.cloud.stream.binder.config.TxEventQJmsConfiguration; import oracle.ucp.jdbc.PoolDataSource; import oracle.ucp.jdbc.PoolDataSourceFactory; import org.junit.jupiter.api.BeforeAll; diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/stream/TxEventQTestBinder.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/database/spring/cloud/stream/binder/TxEventQTestBinder.java similarity index 83% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/stream/TxEventQTestBinder.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/database/spring/cloud/stream/binder/TxEventQTestBinder.java index 968b1f23..64d50813 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/stream/TxEventQTestBinder.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/database/spring/cloud/stream/binder/TxEventQTestBinder.java @@ -22,11 +22,11 @@ * limitations under the License. */ -package com.oracle.stream; +package com.oracle.database.spring.cloud.stream.binder; -import com.oracle.cstream.JMSMessageChannelBinder; -import com.oracle.cstream.config.JmsConsumerProperties; -import com.oracle.cstream.config.JmsProducerProperties; +import com.oracle.database.spring.cloud.stream.binder.JMSMessageChannelBinder; +import com.oracle.database.spring.cloud.stream.binder.config.JmsConsumerProperties; +import com.oracle.database.spring.cloud.stream.binder.config.JmsProducerProperties; import org.springframework.cloud.stream.binder.AbstractTestBinder; import org.springframework.cloud.stream.binder.ExtendedConsumerProperties; import org.springframework.cloud.stream.binder.ExtendedProducerProperties; diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/stream/Util.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/database/spring/cloud/stream/binder/Util.java similarity index 96% rename from database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/stream/Util.java rename to database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/database/spring/cloud/stream/binder/Util.java index bacb9e9a..951b4a72 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/stream/Util.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/com/oracle/database/spring/cloud/stream/binder/Util.java @@ -1,4 +1,4 @@ -package com.oracle.stream; +package com.oracle.database.spring.cloud.stream.binder; import java.io.IOException; import java.sql.SQLException; diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/nativetests/TestObjectDeserializer.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/nativetests/TestObjectDeserializer.java index ac562b7d..27949f17 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/nativetests/TestObjectDeserializer.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/nativetests/TestObjectDeserializer.java @@ -25,7 +25,7 @@ package nativetests; -import com.oracle.cstream.serialize.Deserializer; +import com.oracle.database.spring.cloud.stream.binder.serialize.Deserializer; public class TestObjectDeserializer implements Deserializer { diff --git a/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/nativetests/TestObjectSerializer.java b/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/nativetests/TestObjectSerializer.java index a749ec77..209d6a72 100644 --- a/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/nativetests/TestObjectSerializer.java +++ b/database/spring-cloud-stream-binder-oracle-txeventq/src/test/java/nativetests/TestObjectSerializer.java @@ -25,7 +25,7 @@ package nativetests; -import com.oracle.cstream.serialize.Serializer; +import com.oracle.database.spring.cloud.stream.binder.serialize.Serializer; public class TestObjectSerializer implements Serializer {