From d8874d73be7d35dc879c3830b6619623b122cdae Mon Sep 17 00:00:00 2001 From: Xuan-Zhang Gong Date: Wed, 18 Dec 2024 09:47:15 +0800 Subject: [PATCH 1/2] remove two classes --- .../OAuthBearerLoginCallbackHandler.java | 27 ------------------- .../OAuthBearerValidatorCallbackHandler.java | 27 ------------------- .../oauthbearer/secured/package-info.java | 21 --------------- docs/upgrade.html | 6 +++++ 4 files changed, 6 insertions(+), 75 deletions(-) delete mode 100644 clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/OAuthBearerLoginCallbackHandler.java delete mode 100644 clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/OAuthBearerValidatorCallbackHandler.java delete mode 100644 clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/package-info.java diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/OAuthBearerLoginCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/OAuthBearerLoginCallbackHandler.java deleted file mode 100644 index 68780a2c94e9e..0000000000000 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/OAuthBearerLoginCallbackHandler.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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.common.security.oauthbearer.secured; - -/** - * @deprecated See org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler - */ - -@Deprecated -public class OAuthBearerLoginCallbackHandler extends org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler { - -} diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/OAuthBearerValidatorCallbackHandler.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/OAuthBearerValidatorCallbackHandler.java deleted file mode 100644 index 817f53b9cb12e..0000000000000 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/OAuthBearerValidatorCallbackHandler.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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.common.security.oauthbearer.secured; - -/** - * @deprecated See org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallbackHandler - */ - -@Deprecated -public class OAuthBearerValidatorCallbackHandler extends org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallbackHandler { - -} diff --git a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/package-info.java b/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/package-info.java deleted file mode 100644 index 1d91c7d2f3362..0000000000000 --- a/clients/src/main/java/org/apache/kafka/common/security/oauthbearer/secured/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 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. - */ -/** - * This package is deprecated. - * See {@link org.apache.kafka.common.security.oauthbearer} - */ -package org.apache.kafka.common.security.oauthbearer.secured; \ No newline at end of file diff --git a/docs/upgrade.html b/docs/upgrade.html index 70b8000b9505d..37fef338a472c 100644 --- a/docs/upgrade.html +++ b/docs/upgrade.html @@ -190,6 +190,12 @@
Notable changes in 4 DEAD if the group ID was not found. In Apache Kafka 4.0, the GroupIdNotFoundException is thrown instead as part of the support for new types of group. +
  • The org.apache.kafka.common.security.oauthbearer.secured.OAuthBearerLoginCallbackHandler class was removed. + Please use the org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler class instead. +
    • +
  • The org.apache.kafka.common.security.oauthbearer.secured.OAuthBearerValidatorCallbackHandler class was removed. + Please use the org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallbackHandler class instead. +
    • From 9d221c3d14cdfedd7fe21f9bd385ae51488fc23c Mon Sep 17 00:00:00 2001 From: Xuan-Zhang Gong Date: Wed, 18 Dec 2024 10:05:42 +0800 Subject: [PATCH 2/2] move client to common --- docs/upgrade.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/upgrade.html b/docs/upgrade.html index 37fef338a472c..e3a1fd4b69adc 100644 --- a/docs/upgrade.html +++ b/docs/upgrade.html @@ -44,6 +44,12 @@
    Notable changes in 4
  • The kafka.common.requests.DescribeLogDirsResponse.ReplicaInfo class was removed. Please use the kafka.clients.admin.DescribeLogDirsResult.descriptions() class and kafka.clients.admin.DescribeLogDirsResult.allDescriptions()instead.
    • +
  • The org.apache.kafka.common.security.oauthbearer.secured.OAuthBearerLoginCallbackHandler class was removed. + Please use the org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler class instead. +
    • +
  • The org.apache.kafka.common.security.oauthbearer.secured.OAuthBearerValidatorCallbackHandler class was removed. + Please use the org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallbackHandler class instead. +
  • Broker @@ -190,12 +196,6 @@
    Notable changes in 4 DEAD if the group ID was not found. In Apache Kafka 4.0, the GroupIdNotFoundException is thrown instead as part of the support for new types of group.
    • -
  • The org.apache.kafka.common.security.oauthbearer.secured.OAuthBearerLoginCallbackHandler class was removed. - Please use the org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginCallbackHandler class instead. -
    • -
  • The org.apache.kafka.common.security.oauthbearer.secured.OAuthBearerValidatorCallbackHandler class was removed. - Please use the org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallbackHandler class instead. -