Skip to content

Commit 5669f7e

Browse files
Refactor TxEventQ Stream Binder (#111)
Signed-off-by: Anders Swanson <anders.swanson@oracle.com>
1 parent 8674306 commit 5669f7e

File tree

46 files changed

+103
-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.

46 files changed

+103
-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.cstream</groupId>
32+
<groupId>com.oracle.database.spring.cloud.stream.binder</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.cstream</groupId>
4+
<groupId>com.oracle.database.spring.cloud.stream.binder</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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.oracle.cstream;
1+
package com.oracle.database.spring.cloud.stream.binder;
22

33
import java.util.function.Consumer;
44
import java.util.function.Supplier;
@@ -11,7 +11,7 @@
1111
public class MultipleConsumerTest {
1212
int y = 0;
1313
public static void main(String[] args) {
14-
SpringApplication.run(MultipleConsumerTest.class,
14+
SpringApplication.run(MultipleConsumerTest.class,
1515
"--spring.datasource.url=jdbc:oracle:thin:@cdb1_pdb1_wallet",
1616
"--spring.datasource.oracleucp.connection-properties.oracle.net.wallet_location=C:/tmp/wallet",
1717
"--spring.datasource.oracleucp.connection-properties.oracle.net.tns_admin=C:/tmp/wallet",
@@ -27,19 +27,19 @@ public static void main(String[] args) {
2727
// "--spring.cloud.stream.bindings.pd-out-0.producer.requiredGroups=t1",
2828
// "--spring.cloud.stream.bindings.pd-out-0.producer.poller.fixedDelay=100"); /**/
2929
}
30-
31-
30+
31+
3232
@Bean
3333
public Consumer<String> cs1() {
3434
return to -> System.out.println("Received for cs1: " + to);
3535
}
36-
36+
3737
@Bean
3838
public Consumer<String> cs2() {
3939
return to -> System.out.println("Received for cs2: " + to);
4040
}
41-
42-
41+
42+
4343
// @Bean
4444
// public Supplier<String> pd() {
4545
// return () -> {

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.cloud.spring:${PACKAGE}:${VERSION}"
51+
echo "com.oracle.database.spring.cloud.stream.binder:${PACKAGE}:${VERSION}"
5252
done

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ Spring Cloud Stream exposes a [functional messaging API](https://docs.spring.io/
66

77
### WordSupplier: Message Producer
88

9-
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.
9+
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.
1010

1111
### toUpperCase and stdoutConsumer
1212

13-
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`.
13+
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`.
1414

1515
### Running the tests
1616

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.cstream</groupId>
6+
<groupId>com.oracle.database.spring.cloud.stream.binder</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.cstream</groupId>
55+
<groupId>com.oracle.database.spring.cloud.stream.binder</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.cstream.sample;
3+
package com.oracle.database.spring.cloud.stream.binder.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.cstream.sample;
3+
package com.oracle.database.spring.cloud.stream.binder.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.cstream.sample;
1+
package com.oracle.database.spring.cloud.stream.binder.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.cstream.sample;
3+
package com.oracle.database.spring.cloud.stream.binder.sample;
44

55
import java.time.Duration;
66

0 commit comments

Comments
 (0)