This is an automated email from the ASF dual-hosted git repository.
jerrypeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new cf2fdce improving error messages when loading configs (#1853)
cf2fdce is described below
commit cf2fdce82908ee7654b3ec119f668fc869919574
Author: Boyang Jerry Peng <[email protected]>
AuthorDate: Tue Jun 5 11:01:38 2018 -0700
improving error messages when loading configs (#1853)
* improving error messages when loading configs
* refactoring code
* adding missing import
---
.../org/apache/pulsar/admin/cli/CmdFunctions.java | 3 +-
.../java/org/apache/pulsar/admin/cli/CmdSinks.java | 4 +-
.../org/apache/pulsar/admin/cli/CmdSources.java | 4 +-
.../apache/pulsar/admin/cli/utils/CmdUtils.java | 63 ++++++++++++++++++++++
.../apache/pulsar/functions/sink/PulsarSink.java | 1 -
.../org/apache/pulsar/functions/utils/Utils.java | 7 ---
6 files changed, 69 insertions(+), 13 deletions(-)
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
index e726cce..a200de8 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
@@ -39,6 +39,7 @@ import org.apache.bookkeeper.clients.StorageClientBuilder;
import org.apache.bookkeeper.clients.config.StorageClientSettings;
import org.apache.bookkeeper.clients.utils.NetUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.pulsar.admin.cli.utils.CmdUtils;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.internal.FunctionsImpl;
import org.apache.pulsar.client.api.PulsarClientException;
@@ -259,7 +260,7 @@ public class CmdFunctions extends CmdBase {
// Initialize config builder either from a supplied YAML config
file or from scratch
if (null != fnConfigFile) {
- functionConfig = Utils.loadConfig(fnConfigFile,
FunctionConfig.class);
+ functionConfig = CmdUtils.loadConfig(fnConfigFile,
FunctionConfig.class);
} else {
functionConfig = new FunctionConfig();
}
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
index 607a4d2..14a6fb1 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
@@ -25,6 +25,7 @@ import com.beust.jcommander.converters.StringConverter;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import lombok.Getter;
+import org.apache.pulsar.admin.cli.utils.CmdUtils;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.internal.FunctionsImpl;
import org.apache.pulsar.functions.api.utils.IdentityFunction;
@@ -53,7 +54,6 @@ import static
org.apache.pulsar.common.naming.TopicName.PUBLIC_TENANT;
import static
org.apache.pulsar.functions.utils.Utils.convertProcessingGuarantee;
import static org.apache.pulsar.functions.utils.Utils.fileExists;
import static org.apache.pulsar.functions.utils.Utils.getSinkType;
-import static org.apache.pulsar.functions.utils.Utils.loadConfig;
@Getter
@Parameters(commandDescription = "Interface for managing Pulsar Sinks (Egress
data from Pulsar)")
@@ -168,7 +168,7 @@ public class CmdSinks extends CmdBase {
super.processArguments();
if (null != sinkConfigFile) {
- this.sinkConfig = loadConfig(sinkConfigFile, SinkConfig.class);
+ this.sinkConfig = CmdUtils.loadConfig(sinkConfigFile,
SinkConfig.class);
} else {
this.sinkConfig = new SinkConfig();
}
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
index ffc4891..b604d66 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
@@ -25,6 +25,7 @@ import com.beust.jcommander.converters.StringConverter;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import lombok.Getter;
+import org.apache.pulsar.admin.cli.utils.CmdUtils;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.internal.FunctionsImpl;
import org.apache.pulsar.functions.api.utils.IdentityFunction;
@@ -49,7 +50,6 @@ import static
org.apache.pulsar.common.naming.TopicName.PUBLIC_TENANT;
import static
org.apache.pulsar.functions.utils.Utils.convertProcessingGuarantee;
import static org.apache.pulsar.functions.utils.Utils.fileExists;
import static org.apache.pulsar.functions.utils.Utils.getSourceType;
-import static org.apache.pulsar.functions.utils.Utils.loadConfig;
@Getter
@Parameters(commandDescription = "Interface for managing Pulsar Source
(Ingress data to Pulsar)")
@@ -163,7 +163,7 @@ public class CmdSources extends CmdBase {
super.processArguments();
if (null != sourceConfigFile) {
- this.sourceConfig = loadConfig(sourceConfigFile,
SourceConfig.class);
+ this.sourceConfig = CmdUtils.loadConfig(sourceConfigFile,
SourceConfig.class);
} else {
this.sourceConfig = new SourceConfig();
}
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CmdUtils.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CmdUtils.java
new file mode 100644
index 0000000..c86ea42
--- /dev/null
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CmdUtils.java
@@ -0,0 +1,63 @@
+/**
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.admin.cli.utils;
+
+import com.beust.jcommander.ParameterException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
+import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+
+import java.io.File;
+import java.io.IOException;
+
+public class CmdUtils {
+ public static <T> T loadConfig(String file, Class<T> clazz) throws
IOException {
+ ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
+ try {
+ return mapper.readValue(new File(file), clazz);
+ } catch (Exception ex) {
+ if (ex instanceof UnrecognizedPropertyException) {
+ UnrecognizedPropertyException unrecognizedPropertyException
+ = (UnrecognizedPropertyException) ex;
+
+ String exceptionMessage = String.format("Failed to parse
config file %s. "
+ + "Invalid field '%s' on line: %d column: %d.
Valid fields are %s",
+ file,
+
unrecognizedPropertyException.getPath().get(0).getFieldName(),
+
unrecognizedPropertyException.getLocation().getLineNr(),
+
unrecognizedPropertyException.getLocation().getColumnNr(),
+ unrecognizedPropertyException.getKnownPropertyIds());
+ throw new ParameterException(exceptionMessage);
+ } else if(ex instanceof InvalidFormatException) {
+
+ InvalidFormatException invalidFormatException =
(InvalidFormatException) ex;
+ String exceptionMessage = String.format("Failed to parse
config file %s. %s on line: %d column: %d",
+ file,
+ invalidFormatException.getOriginalMessage(),
+ invalidFormatException.getLocation().getLineNr(),
+ invalidFormatException.getLocation().getColumnNr());
+
+ throw new ParameterException(exceptionMessage);
+ } else {
+ throw new ParameterException(ex.getMessage());
+ }
+ }
+ }
+}
diff --git
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
index 8b246cf..0356ab1 100644
---
a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
+++
b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
@@ -44,7 +44,6 @@ import org.jboss.util.Classes;
import java.util.Base64;
import java.util.Map;
-import java.util.concurrent.CompletableFuture;
@Slf4j
public class PulsarSink<T> implements Sink<T> {
diff --git
a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/Utils.java
b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/Utils.java
index c534ed3..2601ca0 100644
---
a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/Utils.java
+++
b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/Utils.java
@@ -18,8 +18,6 @@
*/
package org.apache.pulsar.functions.utils;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.google.protobuf.AbstractMessage.Builder;
import com.google.protobuf.MessageOrBuilder;
import com.google.protobuf.util.JsonFormat;
@@ -154,11 +152,6 @@ public class Utils {
}
- public static <T> T loadConfig(String file, Class<T> clazz) throws
IOException {
- ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
- return mapper.readValue(new File(file), clazz);
- }
-
public static Runtime convertRuntime(FunctionConfig.Runtime runtime) {
for (Runtime type : Runtime.values()) {
if (type.name().equals(runtime.name())) {
--
To stop receiving notification emails like this one, please contact
[email protected].
