This is an automated email from the ASF dual-hosted git repository.
mattisonchao pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.11 by this push:
new 0c11e4a564e [branch-2.11] Fix compatibility issues (#21163)
0c11e4a564e is described below
commit 0c11e4a564eea556cb1525774b289a45c2e20955
Author: Qiang Zhao <[email protected]>
AuthorDate: Thu Sep 14 08:31:58 2023 +0800
[branch-2.11] Fix compatibility issues (#21163)
---
pom.xml | 2 +-
.../org/apache/pulsar/functions/utils/FunctionConfigUtilsTest.java | 1 -
.../java/org/apache/pulsar/functions/utils/SinkConfigUtilsTest.java | 4 ++--
.../java/org/apache/pulsar/functions/utils/SourceConfigUtilsTest.java | 1 -
.../apache/pulsar/proxy/server/AdminProxyHandlerKeystoreTLSTest.java | 2 +-
5 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4b99290429c..cb9a735b456 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1732,7 +1732,7 @@ flexible messaging model and an intuitive client
API.</description>
<exclude>**/_helpers.tpl</exclude>
<!-- project ignored files -->
- <exclude>*.md</exclude>
+ <exclude>**/*.md</exclude>
<exclude>.github/**</exclude>
<exclude>**/*.nar</exclude>
<exclude>**/.terraform/**</exclude>
diff --git
a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionConfigUtilsTest.java
b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionConfigUtilsTest.java
index 7c384b6e356..d2b387cdf99 100644
---
a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionConfigUtilsTest.java
+++
b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionConfigUtilsTest.java
@@ -447,7 +447,6 @@ public class FunctionConfigUtilsTest {
producerConfig.setMaxPendingMessagesAcrossPartitions(1000);
producerConfig.setUseThreadLocalProducers(true);
producerConfig.setBatchBuilder("DEFAULT");
- producerConfig.setCompressionType(CompressionType.ZLIB);
FunctionConfig newFunctionConfig =
createUpdatedFunctionConfig("producerConfig", producerConfig);
FunctionConfig mergedConfig =
FunctionConfigUtils.validateUpdate(functionConfig, newFunctionConfig);
diff --git
a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SinkConfigUtilsTest.java
b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SinkConfigUtilsTest.java
index ba057e0258c..701e852fa7d 100644
---
a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SinkConfigUtilsTest.java
+++
b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SinkConfigUtilsTest.java
@@ -147,7 +147,7 @@ public class SinkConfigUtilsTest {
SinkConfig sinkConfig = createSinkConfig();
sinkConfig.setRetainOrdering(testcase);
Function.FunctionDetails functionDetails =
SinkConfigUtils.convert(sinkConfig, new
SinkConfigUtils.ExtractedSinkDetails(null, null));
- assertEquals(functionDetails.getRetainOrdering(), testcase != null
? testcase : Boolean.valueOf(false));
+ assertEquals(functionDetails.getRetainOrdering(), testcase != null
? testcase : false);
SinkConfig result =
SinkConfigUtils.convertFromDetails(functionDetails);
assertEquals(result.getRetainOrdering(), testcase != null ?
testcase : Boolean.valueOf(false));
}
@@ -160,7 +160,7 @@ public class SinkConfigUtilsTest {
SinkConfig sinkConfig = createSinkConfig();
sinkConfig.setRetainKeyOrdering(testcase);
Function.FunctionDetails functionDetails =
SinkConfigUtils.convert(sinkConfig, new
SinkConfigUtils.ExtractedSinkDetails(null, null));
- assertEquals(functionDetails.getRetainKeyOrdering(), testcase !=
null ? testcase : Boolean.valueOf(false));
+ assertEquals(functionDetails.getRetainKeyOrdering(), testcase !=
null ? testcase : false);
SinkConfig result =
SinkConfigUtils.convertFromDetails(functionDetails);
assertEquals(result.getRetainKeyOrdering(), testcase != null ?
testcase : Boolean.valueOf(false));
}
diff --git
a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SourceConfigUtilsTest.java
b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SourceConfigUtilsTest.java
index 8a9cec2e1dd..bb459ae2715 100644
---
a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SourceConfigUtilsTest.java
+++
b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/SourceConfigUtilsTest.java
@@ -293,7 +293,6 @@ public class SourceConfigUtilsTest {
producerConfig.setMaxPendingMessagesAcrossPartitions(1000);
producerConfig.setUseThreadLocalProducers(true);
producerConfig.setBatchBuilder("DEFAULT");
- producerConfig.setCompressionType(CompressionType.ZLIB);
SourceConfig newSourceConfig =
createUpdatedSourceConfig("producerConfig", producerConfig);
SourceConfig mergedConfig =
SourceConfigUtils.validateUpdate(sourceConfig, newSourceConfig);
diff --git
a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AdminProxyHandlerKeystoreTLSTest.java
b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AdminProxyHandlerKeystoreTLSTest.java
index d6796b7eaa6..8b8277f9d23 100644
---
a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AdminProxyHandlerKeystoreTLSTest.java
+++
b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/AdminProxyHandlerKeystoreTLSTest.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
