-
Notifications
You must be signed in to change notification settings - Fork 15.4k
KAFKA-13328, KAFKA-13329 (1): Add preflight validations for key, value, and header converter classes #14304
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
C0urante
merged 9 commits into
apache:trunk
from
C0urante:kafka-13328-13329-class-validators
Dec 8, 2023
Merged
KAFKA-13328, KAFKA-13329 (1): Add preflight validations for key, value, and header converter classes #14304
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
840f2c9
KAFKA-13329: Add preflight validation for connector key and value con…
C0urante ac9caf8
KAFKA-13328: Add preflight validation for connector header converter …
C0urante dba0649
Add utility to close Object instances that may be AutoCloseable
C0urante abdc024
Update clients/src/main/java/org/apache/kafka/common/utils/Utils.java
C0urante 1d10efa
Add newline to end of file, fix Javadoc code snippet example, extract…
C0urante 735d35f
Remove warning about method references from Javadocs for Utils::maybe…
C0urante a554695
Simplify Utils::ensureConcrete, refine exception handling in Instanti…
C0urante 8dfeca5
Fix failing unit tests
C0urante 6cf1e13
Change Utils::ensureConcrete to Utils::ensureConcreteSubclass
C0urante File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
connect/runtime/src/main/java/org/apache/kafka/connect/util/ConcreteSubClassValidator.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * 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.kafka.connect.util; | ||
|
|
||
| import org.apache.kafka.common.config.ConfigDef; | ||
| import org.apache.kafka.common.utils.Utils; | ||
|
|
||
| public class ConcreteSubClassValidator implements ConfigDef.Validator { | ||
| private final Class<?> expectedSuperClass; | ||
|
|
||
| private ConcreteSubClassValidator(Class<?> expectedSuperClass) { | ||
| this.expectedSuperClass = expectedSuperClass; | ||
| } | ||
|
|
||
| public static ConcreteSubClassValidator forSuperClass(Class<?> expectedSuperClass) { | ||
|
C0urante marked this conversation as resolved.
Outdated
|
||
| return new ConcreteSubClassValidator(expectedSuperClass); | ||
| } | ||
|
|
||
| @Override | ||
| public void ensureValid(String name, Object value) { | ||
| if (value == null) { | ||
| // The value will be null if the class couldn't be found; no point in performing follow-up validation | ||
| return; | ||
| } | ||
|
yashmayya marked this conversation as resolved.
Outdated
|
||
|
|
||
| Class<?> cls = (Class<?>) value; | ||
| Utils.ensureConcreteSubclass(expectedSuperClass, cls); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "A concrete subclass of " + expectedSuperClass.getName(); | ||
| } | ||
| } | ||
47 changes: 47 additions & 0 deletions
47
connect/runtime/src/main/java/org/apache/kafka/connect/util/InstantiableClassValidator.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * 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.kafka.connect.util; | ||
|
|
||
| import org.apache.kafka.common.config.ConfigDef; | ||
| import org.apache.kafka.common.config.ConfigException; | ||
| import org.apache.kafka.common.utils.Utils; | ||
|
|
||
| public class InstantiableClassValidator implements ConfigDef.Validator { | ||
|
|
||
| @Override | ||
| public void ensureValid(String name, Object value) { | ||
| if (value == null) { | ||
| // The value will be null if the class couldn't be found; no point in performing follow-up validation | ||
| return; | ||
| } | ||
|
|
||
| Class<?> cls = (Class<?>) value; | ||
| try { | ||
| Object o = cls.getDeclaredConstructor().newInstance(); | ||
| Utils.maybeCloseQuietly(o, o + " (instantiated for preflight validation"); | ||
| } catch (NoSuchMethodException | IllegalAccessException e) { | ||
| throw new ConfigException(name, cls.getName(), "Could not find a public no-argument constructor for class" + (e.getMessage() != null ? ": " + e.getMessage() : "")); | ||
| } catch (ReflectiveOperationException | LinkageError | RuntimeException e) { | ||
| throw new ConfigException(name, cls.getName(), "Could not instantiate class" + (e.getMessage() != null ? ": " + e.getMessage() : "")); | ||
| } | ||
|
gharris1727 marked this conversation as resolved.
Outdated
|
||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "A class with a public, no-argument constructor"; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.