Skip to content

Commit 7dfed56

Browse files
Stream binder package/gid rename
Signed-off-by: Anders Swanson <anders.swanson@oracle.com>
1 parent 5669f7e commit 7dfed56

File tree

45 files changed

+94
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+94
-94
lines changed

database/spring-cloud-stream-binder-oracle-txeventq/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ mvn integration-test
2929
To use in an application project, add the following dependencies apart from regular spring-cloud-stream project dependencies:
3030
```
3131
<dependency>
32-
<groupId>com.oracle.database.spring.cloud.stream.binder</groupId>
32+
<groupId>com.oracle.database.spring.cloudstreambinder</groupId>
3333
<artifactId>spring-cloud-stream-binder-oracle-txeventq</artifactId>
3434
<version>0.9.0</version>
3535
</dependency>

database/spring-cloud-stream-binder-oracle-txeventq/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.oracle.database.spring.cloud.stream.binder</groupId>
4+
<groupId>com.oracle.database.spring.cloudstreambinder</groupId>
55
<artifactId>spring-cloud-stream-binder-oracle-txeventq</artifactId>
66
<version>0.9.0</version>
77
<packaging>jar</packaging>

database/spring-cloud-stream-binder-oracle-txeventq/samples/MultipleConsumerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.oracle.database.spring.cloud.stream.binder;
1+
package com.oracle.database.spring.cloudstreambinder;
22

33
import java.util.function.Consumer;
44
import java.util.function.Supplier;

database/spring-cloud-stream-binder-oracle-txeventq/scripts/deploy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ echo "Successfully deployed project to ${REPOSITORY_URL}/${REPOSITORY_NAME}"
4848
PACKAGES="$(mvn -Dexec.executable='echo' -Dexec.args='${project.artifactId}' exec:exec -q)"
4949
printf "The following artifacts have been created for upload:\n\n"
5050
for PACKAGE in $PACKAGES; do
51-
echo "com.oracle.database.spring.cloud.stream.binder:${PACKAGE}:${VERSION}"
51+
echo "com.oracle.database.spring.cloudstreambinder:${PACKAGE}:${VERSION}"
5252
done

database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Copyright (c) 2024, Oracle and/or its affiliates. -->
44
<!-- Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>com.oracle.database.spring.cloud.stream.binder</groupId>
6+
<groupId>com.oracle.database.spring.cloudstreambinder</groupId>
77
<artifactId>spring-cloud-stream-binder-txeventq-sample</artifactId>
88
<version>1.0.0</version>
99
<packaging>jar</packaging>
@@ -52,7 +52,7 @@
5252

5353
<dependencies>
5454
<dependency>
55-
<groupId>com.oracle.database.spring.cloud.stream.binder</groupId>
55+
<groupId>com.oracle.database.spring.cloudstreambinder</groupId>
5656
<artifactId>spring-cloud-stream-binder-oracle-txeventq</artifactId>
5757
<version>${txeventq.streambinder.version}</version>
5858
</dependency>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2024, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3-
package com.oracle.database.spring.cloud.stream.binder.sample;
3+
package com.oracle.database.spring.cloudstreambinder.sample;
44

55
import java.util.function.Consumer;
66
import java.util.function.Function;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2024, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3-
package com.oracle.database.spring.cloud.stream.binder.sample;
3+
package com.oracle.database.spring.cloudstreambinder.sample;
44

55
import org.springframework.boot.SpringApplication;
66
import org.springframework.boot.autoconfigure.SpringBootApplication;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.oracle.database.spring.cloud.stream.binder.sample;
1+
package com.oracle.database.spring.cloudstreambinder.sample;
22

33
import java.util.concurrent.atomic.AtomicBoolean;
44
import java.util.concurrent.atomic.AtomicInteger;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright (c) 2024, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3-
package com.oracle.database.spring.cloud.stream.binder.sample;
3+
package com.oracle.database.spring.cloudstreambinder.sample;
44

55
import java.time.Duration;
66

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
* limitations under the License.
2424
*/
2525

26-
package com.oracle.database.spring.cloud.stream.binder;
26+
package com.oracle.database.spring.cloudstreambinder;
2727

28-
import com.oracle.database.spring.cloud.stream.binder.config.JmsConsumerProperties;
29-
import com.oracle.database.spring.cloud.stream.binder.config.JmsExtendedBindingProperties;
30-
import com.oracle.database.spring.cloud.stream.binder.config.JmsProducerProperties;
31-
import com.oracle.database.spring.cloud.stream.binder.provisioning.JmsConsumerDestination;
32-
import com.oracle.database.spring.cloud.stream.binder.provisioning.JmsProducerDestination;
28+
import com.oracle.database.spring.cloudstreambinder.config.JmsConsumerProperties;
29+
import com.oracle.database.spring.cloudstreambinder.config.JmsExtendedBindingProperties;
30+
import com.oracle.database.spring.cloudstreambinder.config.JmsProducerProperties;
31+
import com.oracle.database.spring.cloudstreambinder.provisioning.JmsConsumerDestination;
32+
import com.oracle.database.spring.cloudstreambinder.provisioning.JmsProducerDestination;
3333

3434

35-
import com.oracle.database.spring.cloud.stream.binder.utils.DestinationNameResolver;
36-
import com.oracle.database.spring.cloud.stream.binder.utils.JmsMessageDrivenChannelAdapterFactory;
37-
import com.oracle.database.spring.cloud.stream.binder.utils.JmsSendingMessageHandlerFactory;
35+
import com.oracle.database.spring.cloudstreambinder.utils.DestinationNameResolver;
36+
import com.oracle.database.spring.cloudstreambinder.utils.JmsMessageDrivenChannelAdapterFactory;
37+
import com.oracle.database.spring.cloudstreambinder.utils.JmsSendingMessageHandlerFactory;
3838
import jakarta.jms.Connection;
3939
import jakarta.jms.ConnectionFactory;
4040
import jakarta.jms.Session;
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder;
25+
package com.oracle.database.spring.cloudstreambinder;
2626

27-
import com.oracle.database.spring.cloud.stream.binder.config.JmsConsumerProperties;
28-
import com.oracle.database.spring.cloud.stream.binder.config.JmsProducerProperties;
29-
import com.oracle.database.spring.cloud.stream.binder.plsql.OracleDBUtils;
30-
import com.oracle.database.spring.cloud.stream.binder.provisioning.JmsConsumerDestination;
31-
import com.oracle.database.spring.cloud.stream.binder.provisioning.JmsProducerDestination;
27+
import com.oracle.database.spring.cloudstreambinder.config.JmsConsumerProperties;
28+
import com.oracle.database.spring.cloudstreambinder.config.JmsProducerProperties;
29+
import com.oracle.database.spring.cloudstreambinder.plsql.OracleDBUtils;
30+
import com.oracle.database.spring.cloudstreambinder.provisioning.JmsConsumerDestination;
31+
import com.oracle.database.spring.cloudstreambinder.provisioning.JmsProducerDestination;
3232
import jakarta.jms.Connection;
3333
import jakarta.jms.ConnectionFactory;
3434
import jakarta.jms.JMSException;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* limitations under the License.
2424
*/
2525

26-
package com.oracle.database.spring.cloud.stream.binder.config;
26+
package com.oracle.database.spring.cloudstreambinder.config;
2727

2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2929
import org.springframework.cloud.stream.binder.Binder;
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.config;
26-
27-
import com.oracle.database.spring.cloud.stream.binder.JMSMessageChannelBinder;
28-
import com.oracle.database.spring.cloud.stream.binder.utils.Base64UrlNamingStrategy;
29-
import com.oracle.database.spring.cloud.stream.binder.utils.DestinationNameResolver;
30-
import com.oracle.database.spring.cloud.stream.binder.utils.JmsMessageDrivenChannelAdapterFactory;
31-
import com.oracle.database.spring.cloud.stream.binder.utils.JmsSendingMessageHandlerFactory;
32-
import com.oracle.database.spring.cloud.stream.binder.utils.ListenerContainerFactory;
33-
import com.oracle.database.spring.cloud.stream.binder.utils.MessageRecoverer;
34-
import com.oracle.database.spring.cloud.stream.binder.utils.RepublishMessageRecoverer;
35-
import com.oracle.database.spring.cloud.stream.binder.utils.SpecCompliantJmsHeaderMapper;
25+
package com.oracle.database.spring.cloudstreambinder.config;
26+
27+
import com.oracle.database.spring.cloudstreambinder.JMSMessageChannelBinder;
28+
import com.oracle.database.spring.cloudstreambinder.utils.Base64UrlNamingStrategy;
29+
import com.oracle.database.spring.cloudstreambinder.utils.DestinationNameResolver;
30+
import com.oracle.database.spring.cloudstreambinder.utils.JmsMessageDrivenChannelAdapterFactory;
31+
import com.oracle.database.spring.cloudstreambinder.utils.JmsSendingMessageHandlerFactory;
32+
import com.oracle.database.spring.cloudstreambinder.utils.ListenerContainerFactory;
33+
import com.oracle.database.spring.cloudstreambinder.utils.MessageRecoverer;
34+
import com.oracle.database.spring.cloudstreambinder.utils.RepublishMessageRecoverer;
35+
import com.oracle.database.spring.cloudstreambinder.utils.SpecCompliantJmsHeaderMapper;
3636
import jakarta.jms.ConnectionFactory;
3737
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3838
import org.springframework.boot.context.properties.EnableConfigurationProperties;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.config;
25+
package com.oracle.database.spring.cloudstreambinder.config;
2626

2727
import org.springframework.cloud.stream.binder.BinderSpecificPropertiesProvider;
2828

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.config;
25+
package com.oracle.database.spring.cloudstreambinder.config;
2626

2727
public class JmsConsumerProperties {
2828
private static final String DEFAULT_DLQ_NAME = "Spring_Cloud_Stream_dlq";
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.config;
25+
package com.oracle.database.spring.cloudstreambinder.config;
2626

2727
import java.util.Map;
2828

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.config;
25+
package com.oracle.database.spring.cloudstreambinder.config;
2626

2727
public class JmsProducerProperties {
2828
private String serializer = null;
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.config;
25+
package com.oracle.database.spring.cloudstreambinder.config;
2626

27-
import com.oracle.database.spring.cloud.stream.binder.TxEventQQueueProvisioner;
28-
import com.oracle.database.spring.cloud.stream.binder.plsql.OracleDBUtils;
27+
import com.oracle.database.spring.cloudstreambinder.TxEventQQueueProvisioner;
28+
import com.oracle.database.spring.cloudstreambinder.plsql.OracleDBUtils;
2929

3030
import jakarta.jms.ConnectionFactory;
3131
import jakarta.jms.JMSException;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.plsql;
25+
package com.oracle.database.spring.cloudstreambinder.plsql;
2626

2727
import java.sql.CallableStatement;
2828
import java.sql.Connection;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.provisioning;
25+
package com.oracle.database.spring.cloudstreambinder.provisioning;
2626

2727
import org.springframework.cloud.stream.provisioning.ConsumerDestination;
2828

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.provisioning;
25+
package com.oracle.database.spring.cloudstreambinder.provisioning;
2626

2727
import jakarta.jms.JMSException;
2828
import jakarta.jms.Topic;
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.serialize;
25+
package com.oracle.database.spring.cloudstreambinder.serialize;
2626

2727
import org.slf4j.Logger;
2828
import org.slf4j.LoggerFactory;
@@ -66,8 +66,8 @@ public Object fromMessage(Message jmsMessage) throws JMSException {
6666
}
6767

6868
if (!isInstanceOfDeserializer) {
69-
logger.debug("The configured deserializer class is not an instance of 'com.oracle.database.spring.cloud.stream.binder.serialize.DeSerializer'");
70-
throw new IllegalArgumentException("The configured serializer class is not an instance of 'com.oracle.database.spring.cloud.stream.binder.serialize.DeSerializer'");
69+
logger.debug("The configured deserializer class is not an instance of 'com.oracle.database.spring.cloudstreambinder.serialize.DeSerializer'");
70+
throw new IllegalArgumentException("The configured serializer class is not an instance of 'com.oracle.database.spring.cloudstreambinder.serialize.DeSerializer'");
7171
}
7272

7373
Deserializer<?> s = null;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.serialize;
25+
package com.oracle.database.spring.cloudstreambinder.serialize;
2626

2727
public interface Deserializer<T> {
2828
T deserialize(byte[] bytes);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.serialize;
25+
package com.oracle.database.spring.cloudstreambinder.serialize;
2626

2727
public interface Serializer {
2828
byte[] serialize(Object data);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.utils;
25+
package com.oracle.database.spring.cloudstreambinder.utils;
2626

2727
public interface AnonymousNamingStrategy {
2828

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.utils;
25+
package com.oracle.database.spring.cloudstreambinder.utils;
2626

2727
import java.nio.ByteBuffer;
2828
import java.util.Base64;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.utils;
25+
package com.oracle.database.spring.cloudstreambinder.utils;
2626

2727
import org.springframework.util.StringUtils;
2828

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.utils;
25+
package com.oracle.database.spring.cloudstreambinder.utils;
2626

2727
import org.springframework.beans.BeansException;
2828
import org.springframework.context.ApplicationContext;
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.utils;
25+
package com.oracle.database.spring.cloudstreambinder.utils;
2626

27-
import com.oracle.database.spring.cloud.stream.binder.config.JmsConsumerProperties;
28-
import com.oracle.database.spring.cloud.stream.binder.serialize.CustomSerializationMessageConverter;
27+
import com.oracle.database.spring.cloudstreambinder.config.JmsConsumerProperties;
28+
import com.oracle.database.spring.cloudstreambinder.serialize.CustomSerializationMessageConverter;
2929

3030
import jakarta.jms.BytesMessage;
3131
import jakarta.jms.Destination;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.utils;
25+
package com.oracle.database.spring.cloudstreambinder.utils;
2626

2727
import org.springframework.beans.BeansException;
2828
import org.springframework.beans.factory.BeanFactory;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.utils;
25+
package com.oracle.database.spring.cloudstreambinder.utils;
2626

2727
import jakarta.jms.ConnectionFactory;
2828
import jakarta.jms.Destination;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.utils;
25+
package com.oracle.database.spring.cloudstreambinder.utils;
2626

2727
import jakarta.jms.Message;
2828

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.utils;
25+
package com.oracle.database.spring.cloudstreambinder.utils;
2626

2727
import jakarta.jms.Destination;
2828
import jakarta.jms.JMSException;
@@ -39,7 +39,7 @@
3939
import org.springframework.messaging.MessageChannel;
4040
import org.springframework.messaging.support.ErrorMessage;
4141

42-
import com.oracle.database.spring.cloud.stream.binder.serialize.Serializer;
42+
import com.oracle.database.spring.cloudstreambinder.serialize.Serializer;
4343

4444
public class PartitionAwareJmsSendingMessageHandler
4545
extends AbstractMessageHandler
@@ -119,8 +119,8 @@ protected void jmsHandleMessageInternal(Message<?> message) {
119119
}
120120

121121
if (!isInstanceOfSerializer) {
122-
logger.debug("The configured serializer class is not an instance of 'com.oracle.database.spring.cloud.stream.binder.serialize.Serializer'");
123-
throw new IllegalArgumentException("The configured serializer class is not an instance of 'com.oracle.database.spring.cloud.stream.binder.serialize.Serializer'");
122+
logger.debug("The configured serializer class is not an instance of 'com.oracle.database.spring.cloudstreambinder.serialize.Serializer'");
123+
throw new IllegalArgumentException("The configured serializer class is not an instance of 'com.oracle.database.spring.cloudstreambinder.serialize.Serializer'");
124124
}
125125
Serializer s = null;
126126

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* limitations under the License.
2323
*/
2424

25-
package com.oracle.database.spring.cloud.stream.binder.utils;
25+
package com.oracle.database.spring.cloudstreambinder.utils;
2626

2727
import jakarta.jms.JMSException;
2828
import jakarta.jms.Message;

0 commit comments

Comments
 (0)