Skip to content

Commit f6d6ccb

Browse files
committed
Fix compilation errors
Revert Confluent version bump Revert Avro version bump (cannot use 0.12.0 as it requires Java 11, but this branch is using Java 8)
1 parent 8945a45 commit f6d6ccb

15 files changed

+16
-16
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.confluent</groupId>
99
<artifactId>rest-utils-parent</artifactId>
10-
<version>[7.3.0-0,7.4.0-0)</version>
10+
<version>[7.2.15-0, 7.2.16-0)</version>
1111
</parent>
1212

1313
<artifactId>kafka-streams-examples</artifactId>
@@ -50,7 +50,7 @@
5050
-->
5151
<properties>
5252
<algebird.version>0.13.7</algebird.version>
53-
<avro.version>1.12.0</avro.version>
53+
<avro.version>1.11.4</avro.version>
5454
<chill.version>0.9.5</chill.version>
5555
<docker.skip-build>false</docker.skip-build>
5656
<docker.skip-test>false</docker.skip-test>

src/main/java/io/confluent/examples/streams/microservices/AddInventory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static void main(final String[] args) throws Exception {
7979

8080
final String bootstrapServers = cl.getOptionValue("b", DEFAULT_BOOTSTRAP_SERVERS);
8181

82-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
82+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
8383
.map(path -> {
8484
try {
8585
return buildPropertiesFromConfigFile(path);

src/main/java/io/confluent/examples/streams/microservices/EmailService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public static void main(final String[] args) throws Exception {
152152
}
153153
final EmailService service = new EmailService(new LoggingEmailer());
154154

155-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
155+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
156156
.map(path -> {
157157
try {
158158
return buildPropertiesFromConfigFile(path);

src/main/java/io/confluent/examples/streams/microservices/FraudService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public static void main(final String[] args) throws Exception {
166166
return;
167167
}
168168
final FraudService service = new FraudService();
169-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
169+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
170170
.map(path -> {
171171
try {
172172
return buildPropertiesFromConfigFile(path);

src/main/java/io/confluent/examples/streams/microservices/InventoryService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public static void main(final String[] args) throws Exception {
202202
return;
203203
}
204204

205-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
205+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
206206
.map(path -> {
207207
try {
208208
return buildPropertiesFromConfigFile(path);

src/main/java/io/confluent/examples/streams/microservices/OrderDetailsService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public static void main(final String[] args) throws Exception {
220220
formatter.printHelp("Order Details Service", opts);
221221
return;
222222
}
223-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
223+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
224224
.map(path -> {
225225
try {
226226
return buildPropertiesFromConfigFile(path);

src/main/java/io/confluent/examples/streams/microservices/OrdersService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ public static void main(final String[] args) throws Exception {
445445
final int restPort = Integer.parseInt(cl.getOptionValue("port", "5432"));
446446
final String stateDir = cl.getOptionValue("state-dir", "/tmp/kafka-streams");
447447

448-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
448+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
449449
.map(path -> {
450450
try {
451451
return buildPropertiesFromConfigFile(path);

src/main/java/io/confluent/examples/streams/microservices/PostOrdersAndPayments.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public static void main(final String[] args) throws Exception {
9696
final String orderServiceUrl = cl.getOptionValue("order-service-url", "http://localhost:5432");
9797
final int startingOrderId = Integer.parseInt(cl.getOptionValue("order-id", "1"));
9898

99-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
99+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
100100
.map(path -> {
101101
try {
102102
return buildPropertiesFromConfigFile(path);

src/main/java/io/confluent/examples/streams/microservices/ValidationsAggregatorService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public static void main(final String[] args) throws Exception {
180180
formatter.printHelp("Validator Aggregator Service", opts);
181181
return;
182182
}
183-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
183+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
184184
.map(path -> {
185185
try {
186186
return buildPropertiesFromConfigFile(path);

src/main/java/io/confluent/examples/streams/microservices/util/ConsumeCustomers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static void main(final String[] args) throws Exception {
4040
final String bootstrapServers = cl.getOptionValue("b", DEFAULT_BOOTSTRAP_SERVERS);
4141
final String schemaRegistryUrl = cl.getOptionValue("schema-registry", DEFAULT_SCHEMA_REGISTRY_URL);
4242

43-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
43+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
4444
.map(path -> {
4545
try {
4646
return buildPropertiesFromConfigFile(path);

src/main/java/io/confluent/examples/streams/microservices/util/ConsumeOrders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static void main(final String[] args) throws Exception {
4040
final String bootstrapServers = cl.getOptionValue("b", DEFAULT_BOOTSTRAP_SERVERS);
4141
final String schemaRegistryUrl = cl.getOptionValue("schema-registry", DEFAULT_SCHEMA_REGISTRY_URL);
4242

43-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
43+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
4444
.map(path -> {
4545
try {
4646
return buildPropertiesFromConfigFile(path);

src/main/java/io/confluent/examples/streams/microservices/util/ConsumePayments.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static void main(final String[] args) throws Exception {
3939
final String bootstrapServers = cl.getOptionValue("b", DEFAULT_BOOTSTRAP_SERVERS);
4040
final String schemaRegistryUrl = cl.getOptionValue("schema-registry", DEFAULT_SCHEMA_REGISTRY_URL);
4141

42-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
42+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
4343
.map(path -> {
4444
try {
4545
return buildPropertiesFromConfigFile(path);

src/main/java/io/confluent/examples/streams/microservices/util/ProduceCustomers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static void main(final String[] args) throws Exception {
4646
Collections.singletonMap(AbstractKafkaSchemaSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG, schemaRegistryUrl),
4747
isKeySerde);
4848

49-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
49+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
5050
.map(path -> {
5151
try {
5252
return buildPropertiesFromConfigFile(path);

src/main/java/io/confluent/examples/streams/microservices/util/ProduceOrders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static void main(final String[] args) throws Exception {
4040

4141
final CommandLine cl = new DefaultParser().parse(opts, args);
4242

43-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
43+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
4444
.map(path -> {
4545
try {
4646
return buildPropertiesFromConfigFile(path);

src/main/java/io/confluent/examples/streams/microservices/util/ProducePayments.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static void main(final String[] args) throws Exception {
3838

3939
final CommandLine cl = new DefaultParser().parse(opts, args);
4040

41-
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", null))
41+
final Properties defaultConfig = Optional.ofNullable(cl.getOptionValue("config-file", (String) null))
4242
.map(path -> {
4343
try {
4444
return buildPropertiesFromConfigFile(path);

0 commit comments

Comments
 (0)