This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 20216d1 [functions] Fix typos in exceptions related to functions
(#6910)
20216d1 is described below
commit 20216d1cb80826ebb246f4ed75aa7187a1488f94
Author: Sergii Zhevzhyk <[email protected]>
AuthorDate: Fri May 8 21:25:12 2020 +0200
[functions] Fix typos in exceptions related to functions (#6910)
### Modifications
Fix typos in exceptions related to functions. The tests were updated as
well.
---
.../pulsar/functions/utils/FunctionConfigUtils.java | 18 ++++++++++--------
.../apache/pulsar/functions/utils/SinkConfigUtils.java | 4 ++--
.../pulsar/functions/utils/SourceConfigUtils.java | 3 +--
.../functions/utils/FunctionConfigUtilsTest.java | 8 ++++----
.../pulsar/functions/utils/SinkConfigUtilsTest.java | 8 ++++----
.../pulsar/functions/utils/SourceConfigUtilsTest.java | 4 ++--
6 files changed, 23 insertions(+), 22 deletions(-)
diff --git
a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfigUtils.java
b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfigUtils.java
index 47bef24..10395d5 100644
---
a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfigUtils.java
+++
b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfigUtils.java
@@ -34,9 +34,11 @@ import
org.apache.pulsar.functions.proto.Function.FunctionDetails;
import java.io.File;
import java.lang.reflect.Type;
import java.net.MalformedURLException;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.apache.commons.lang.StringUtils.isNotEmpty;
@@ -431,7 +433,7 @@ public class FunctionConfigUtils {
// Need to make sure that one and only one of schema/serde is
set
if (!isEmpty(conf.getSchemaType()) &&
!isEmpty(conf.getSerdeClassName())) {
throw new IllegalArgumentException(
- String.format("Only one of schemaType or
serdeClassName should be set in inputSpec"));
+ "Only one of schemaType or serdeClassName should be
set in inputSpec");
}
if (!isEmpty(conf.getSerdeClassName())) {
ValidatorUtils.validateSerde(conf.getSerdeClassName(),
typeArgs[0], clsLoader, true);
@@ -449,7 +451,7 @@ public class FunctionConfigUtils {
// One and only one of outputSchemaType and outputSerdeClassName
should be set
if (!isEmpty(functionConfig.getOutputSerdeClassName()) &&
!isEmpty(functionConfig.getOutputSchemaType())) {
throw new IllegalArgumentException(
- String.format("Only one of outputSchemaType or
outputSerdeClassName should be set"));
+ "Only one of outputSchemaType or outputSerdeClassName should
be set");
}
if (!isEmpty(functionConfig.getOutputSchemaType())) {
@@ -606,7 +608,7 @@ public class FunctionConfigUtils {
// receiver queue size should be >= 0
if (conf.getReceiverQueueSize() != null &&
conf.getReceiverQueueSize() < 0) {
throw new IllegalArgumentException(
- String.format("Receiver queue size should be >=
zero"));
+ "Receiver queue size should be >= zero");
}
});
}
@@ -743,10 +745,10 @@ public class FunctionConfigUtils {
mergedConfig.setLogTopic(newConfig.getLogTopic());
}
if (newConfig.getProcessingGuarantees() != null &&
!newConfig.getProcessingGuarantees().equals(existingConfig.getProcessingGuarantees()))
{
- throw new IllegalArgumentException("Processing Guarantess cannot
be altered");
+ throw new IllegalArgumentException("Processing Guarantees cannot
be altered");
}
if (newConfig.getRetainOrdering() != null &&
!newConfig.getRetainOrdering().equals(existingConfig.getRetainOrdering())) {
- throw new IllegalArgumentException("Retain Orderning cannot be
altered");
+ throw new IllegalArgumentException("Retain Ordering cannot be
altered");
}
if (!StringUtils.isEmpty(newConfig.getOutput())) {
mergedConfig.setOutput(newConfig.getOutput());
diff --git
a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfigUtils.java
b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfigUtils.java
index 8e9fd13..0c50265 100644
---
a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfigUtils.java
+++
b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfigUtils.java
@@ -546,7 +546,7 @@ public class SinkConfigUtils {
});
}
if (newConfig.getProcessingGuarantees() != null &&
!newConfig.getProcessingGuarantees().equals(existingConfig.getProcessingGuarantees()))
{
- throw new IllegalArgumentException("Processing Guarantess cannot
be altered");
+ throw new IllegalArgumentException("Processing Guarantees cannot
be altered");
}
if (newConfig.getConfigs() != null) {
mergedConfig.setConfigs(newConfig.getConfigs());
@@ -558,7 +558,7 @@ public class SinkConfigUtils {
mergedConfig.setParallelism(newConfig.getParallelism());
}
if (newConfig.getRetainOrdering() != null &&
!newConfig.getRetainOrdering().equals(existingConfig.getRetainOrdering())) {
- throw new IllegalArgumentException("Retain Orderning cannot be
altered");
+ throw new IllegalArgumentException("Retain Ordering cannot be
altered");
}
if (newConfig.getAutoAck() != null &&
!newConfig.getAutoAck().equals(existingConfig.getAutoAck())) {
throw new IllegalArgumentException("AutoAck cannot be altered");
diff --git
a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfigUtils.java
b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfigUtils.java
index b50b828..c3d6d0a 100644
---
a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfigUtils.java
+++
b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfigUtils.java
@@ -86,7 +86,6 @@ public class SourceConfigUtils {
functionDetailsBuilder.setProcessingGuarantees(
convertProcessingGuarantee(sourceConfig.getProcessingGuarantees()));
}
-
// set source spec
Function.SourceSpec.Builder sourceSpecBuilder =
Function.SourceSpec.newBuilder();
if (sourceDetails.getSourceClassName() != null) {
@@ -366,7 +365,7 @@ public class SourceConfigUtils {
mergedConfig.setSecrets(newConfig.getSecrets());
}
if (newConfig.getProcessingGuarantees() != null &&
!newConfig.getProcessingGuarantees().equals(existingConfig.getProcessingGuarantees()))
{
- throw new IllegalArgumentException("Processing Guarantess cannot
be altered");
+ throw new IllegalArgumentException("Processing Guarantees cannot
be altered");
}
if (newConfig.getParallelism() != null) {
mergedConfig.setParallelism(newConfig.getParallelism());
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 0562c11..3d7d106 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
@@ -217,18 +217,18 @@ public class FunctionConfigUtilsTest {
assertTrue(mergedConfig.getCleanupSubscription());
}
- @Test(expectedExceptions = IllegalArgumentException.class,
expectedExceptionsMessageRegExp = "Processing Guarantess cannot be altered")
+ @Test(expectedExceptions = IllegalArgumentException.class,
expectedExceptionsMessageRegExp = "Processing Guarantees cannot be altered")
public void testMergeDifferentProcessingGuarantees() {
FunctionConfig functionConfig = createFunctionConfig();
FunctionConfig newFunctionConfig =
createUpdatedFunctionConfig("processingGuarantees", EFFECTIVELY_ONCE);
- FunctionConfig mergedConfig =
FunctionConfigUtils.validateUpdate(functionConfig, newFunctionConfig);
+ FunctionConfigUtils.validateUpdate(functionConfig, newFunctionConfig);
}
- @Test(expectedExceptions = IllegalArgumentException.class,
expectedExceptionsMessageRegExp = "Retain Orderning cannot be altered")
+ @Test(expectedExceptions = IllegalArgumentException.class,
expectedExceptionsMessageRegExp = "Retain Ordering cannot be altered")
public void testMergeDifferentRetainOrdering() {
FunctionConfig functionConfig = createFunctionConfig();
FunctionConfig newFunctionConfig =
createUpdatedFunctionConfig("retainOrdering", true);
- FunctionConfig mergedConfig =
FunctionConfigUtils.validateUpdate(functionConfig, newFunctionConfig);
+ FunctionConfigUtils.validateUpdate(functionConfig, newFunctionConfig);
}
@Test
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 eb6ab39..47515d6 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
@@ -148,18 +148,18 @@ public class SinkConfigUtilsTest {
assertEquals(mergedConfig.getInputSpecs().get("test-input"),
newSinkConfig.getInputSpecs().get("test-input"));
}
- @Test(expectedExceptions = IllegalArgumentException.class,
expectedExceptionsMessageRegExp = "Processing Guarantess cannot be altered")
+ @Test(expectedExceptions = IllegalArgumentException.class,
expectedExceptionsMessageRegExp = "Processing Guarantees cannot be altered")
public void testMergeDifferentProcessingGuarantees() {
SinkConfig sinkConfig = createSinkConfig();
SinkConfig newSinkConfig =
createUpdatedSinkConfig("processingGuarantees", EFFECTIVELY_ONCE);
- SinkConfig mergedConfig = SinkConfigUtils.validateUpdate(sinkConfig,
newSinkConfig);
+ SinkConfigUtils.validateUpdate(sinkConfig, newSinkConfig);
}
- @Test(expectedExceptions = IllegalArgumentException.class,
expectedExceptionsMessageRegExp = "Retain Orderning cannot be altered")
+ @Test(expectedExceptions = IllegalArgumentException.class,
expectedExceptionsMessageRegExp = "Retain Ordering cannot be altered")
public void testMergeDifferentRetainOrdering() {
SinkConfig sinkConfig = createSinkConfig();
SinkConfig newSinkConfig = createUpdatedSinkConfig("retainOrdering",
true);
- SinkConfig mergedConfig = SinkConfigUtils.validateUpdate(sinkConfig,
newSinkConfig);
+ SinkConfigUtils.validateUpdate(sinkConfig, newSinkConfig);
}
@Test
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 2005902..3c6ee73 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
@@ -119,11 +119,11 @@ public class SourceConfigUtilsTest {
);
}
- @Test(expectedExceptions = IllegalArgumentException.class,
expectedExceptionsMessageRegExp = "Processing Guarantess cannot be altered")
+ @Test(expectedExceptions = IllegalArgumentException.class,
expectedExceptionsMessageRegExp = "Processing Guarantees cannot be altered")
public void testMergeDifferentProcessingGuarantees() {
SourceConfig sourceConfig = createSourceConfig();
SourceConfig newSourceConfig =
createUpdatedSourceConfig("processingGuarantees", EFFECTIVELY_ONCE);
- SourceConfig mergedConfig =
SourceConfigUtils.validateUpdate(sourceConfig, newSourceConfig);
+ SourceConfigUtils.validateUpdate(sourceConfig, newSourceConfig);
}
@Test
