This is an automated email from the ASF dual-hosted git repository.
rsivaram pushed a commit to branch 2.4
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/2.4 by this push:
new e9fcfe4 KAFKA-8943: Move SecurityProviderCreator to
org.apache.kafka.common.security.auth package (#7564)
e9fcfe4 is described below
commit e9fcfe4fb7b9ae2f537ce355fe2ab51a58034c64
Author: Manikumar Reddy <[email protected]>
AuthorDate: Mon Oct 21 13:18:33 2019 +0530
KAFKA-8943: Move SecurityProviderCreator to
org.apache.kafka.common.security.auth package (#7564)
Reviewers: Mickael Maison <[email protected]>, Rajini Sivaram
<[email protected]>
---
.../src/main/java/org/apache/kafka/common/config/SecurityConfig.java | 5 +++--
.../kafka/common/security/{ => auth}/SecurityProviderCreator.java | 4 +++-
.../src/main/java/org/apache/kafka/common/utils/SecurityUtils.java | 2 +-
.../common/security/ssl/mock/TestPlainSaslServerProviderCreator.java | 2 +-
.../apache/kafka/common/security/ssl/mock/TestProviderCreator.java | 2 +-
.../common/security/ssl/mock/TestScramSaslServerProviderCreator.java | 2 +-
.../test/java/org/apache/kafka/common/utils/SecurityUtilsTest.java | 2 +-
7 files changed, 11 insertions(+), 8 deletions(-)
diff --git
a/clients/src/main/java/org/apache/kafka/common/config/SecurityConfig.java
b/clients/src/main/java/org/apache/kafka/common/config/SecurityConfig.java
index 0889aa5..b4dc26c 100644
--- a/clients/src/main/java/org/apache/kafka/common/config/SecurityConfig.java
+++ b/clients/src/main/java/org/apache/kafka/common/config/SecurityConfig.java
@@ -22,7 +22,8 @@ package org.apache.kafka.common.config;
public class SecurityConfig {
public static final String SECURITY_PROVIDERS_CONFIG =
"security.providers";
- public static final String SECURITY_PROVIDERS_DOC = "A list of
configurable creators each returning a provider " +
- "implementing security algorithms";
+ public static final String SECURITY_PROVIDERS_DOC = "A list of
configurable creator classes each returning a provider" +
+ " implementing security algorithms. These classes should implement
the" +
+ "
<code>org.apache.kafka.common.security.auth.SecurityProviderCreator</code>
interface.";
}
diff --git
a/clients/src/main/java/org/apache/kafka/common/security/SecurityProviderCreator.java
b/clients/src/main/java/org/apache/kafka/common/security/auth/SecurityProviderCreator.java
similarity index 90%
rename from
clients/src/main/java/org/apache/kafka/common/security/SecurityProviderCreator.java
rename to
clients/src/main/java/org/apache/kafka/common/security/auth/SecurityProviderCreator.java
index e5f3a7c..ae56f9a 100644
---
a/clients/src/main/java/org/apache/kafka/common/security/SecurityProviderCreator.java
+++
b/clients/src/main/java/org/apache/kafka/common/security/auth/SecurityProviderCreator.java
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.kafka.common.security;
+package org.apache.kafka.common.security.auth;
import org.apache.kafka.common.Configurable;
+import org.apache.kafka.common.annotation.InterfaceStability;
import java.security.Provider;
import java.util.Map;
@@ -24,6 +25,7 @@ import java.util.Map;
/**
* An interface for generating security providers.
*/
[email protected]
public interface SecurityProviderCreator extends Configurable {
/**
diff --git
a/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java
b/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java
index d6595ef..09c97be 100644
--- a/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java
+++ b/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java
@@ -19,7 +19,7 @@ package org.apache.kafka.common.utils;
import org.apache.kafka.common.acl.AclOperation;
import org.apache.kafka.common.config.SecurityConfig;
import org.apache.kafka.common.resource.ResourceType;
-import org.apache.kafka.common.security.SecurityProviderCreator;
+import org.apache.kafka.common.security.auth.SecurityProviderCreator;
import org.apache.kafka.common.security.auth.KafkaPrincipal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestPlainSaslServerProviderCreator.java
b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestPlainSaslServerProviderCreator.java
index fa476a5..0ab927e 100644
---
a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestPlainSaslServerProviderCreator.java
+++
b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestPlainSaslServerProviderCreator.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.common.security.ssl.mock;
-import org.apache.kafka.common.security.SecurityProviderCreator;
+import org.apache.kafka.common.security.auth.SecurityProviderCreator;
import java.security.Provider;
diff --git
a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestProviderCreator.java
b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestProviderCreator.java
index 5f4929f..57c455a 100644
---
a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestProviderCreator.java
+++
b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestProviderCreator.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.common.security.ssl.mock;
-import org.apache.kafka.common.security.SecurityProviderCreator;
+import org.apache.kafka.common.security.auth.SecurityProviderCreator;
import java.security.Provider;
diff --git
a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestScramSaslServerProviderCreator.java
b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestScramSaslServerProviderCreator.java
index f03f8c9..72eb880 100644
---
a/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestScramSaslServerProviderCreator.java
+++
b/clients/src/test/java/org/apache/kafka/common/security/ssl/mock/TestScramSaslServerProviderCreator.java
@@ -16,7 +16,7 @@
*/
package org.apache.kafka.common.security.ssl.mock;
-import org.apache.kafka.common.security.SecurityProviderCreator;
+import org.apache.kafka.common.security.auth.SecurityProviderCreator;
import java.security.Provider;
diff --git
a/clients/src/test/java/org/apache/kafka/common/utils/SecurityUtilsTest.java
b/clients/src/test/java/org/apache/kafka/common/utils/SecurityUtilsTest.java
index 903ac5c..d182a00 100644
--- a/clients/src/test/java/org/apache/kafka/common/utils/SecurityUtilsTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/utils/SecurityUtilsTest.java
@@ -17,7 +17,7 @@
package org.apache.kafka.common.utils;
import org.apache.kafka.common.config.SecurityConfig;
-import org.apache.kafka.common.security.SecurityProviderCreator;
+import org.apache.kafka.common.security.auth.SecurityProviderCreator;
import org.apache.kafka.common.security.auth.KafkaPrincipal;
import
org.apache.kafka.common.security.ssl.mock.TestPlainSaslServerProviderCreator;
import
org.apache.kafka.common.security.ssl.mock.TestScramSaslServerProviderCreator;
