Remove schema validator from annotations since it requires slightly m…

…ore information (apache#2445) and is therefore done explitcly
vruc · Aug 28, 2018 · b234f33 · b234f33
1 parent 8ba8688
commit b234f33
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfig.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfig.java
@@ -29,7 +29,6 @@
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.apache.pulsar.functions.api.Function;
 import org.apache.pulsar.functions.api.SerDe;
 import org.apache.pulsar.functions.utils.validation.ConfigValidation;
 
@@ -82,8 +81,6 @@ public enum Runtime {
     private Map<String, String> customSerdeInputs;
     @isValidTopicName
     private String topicsPattern;
-    @isMapEntryCustom(keyValidatorClasses = { ValidatorImpls.TopicNameValidator.class },
-            valueValidatorClasses = { ValidatorImpls.SchemaValidator.class }, targetRuntime = ConfigValidation.Runtime.JAVA)
     @isMapEntryCustom(keyValidatorClasses = { ValidatorImpls.TopicNameValidator.class }, targetRuntime = ConfigValidation.Runtime.PYTHON)
     private Map<String, String> customSchemaInputs;
 

diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfig.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SinkConfig.java
@@ -66,8 +66,7 @@ public class SinkConfig {
     @isValidTopicName
     private String topicsPattern;
 
-    @isMapEntryCustom(keyValidatorClasses = { ValidatorImpls.TopicNameValidator.class },
-            valueValidatorClasses = { ValidatorImpls.SchemaValidator.class })
+    @isMapEntryCustom(keyValidatorClasses = { ValidatorImpls.TopicNameValidator.class })
     private Map<String, String> topicToSchemaType;
 
     private Map<String, ConsumerConfig> inputSpecs = new TreeMap<>();

diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfig.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/SourceConfig.java
@@ -58,7 +58,6 @@ public class SourceConfig {
     @isImplementationOfClass(implementsClass = SerDe.class)
     private String serdeClassName;
 
-    @isImplementationOfClass(implementsClass = Schema.class)
     private String schemaType;
 
     private Map<String, Object> configs;