KAFKA-18706: Move ScramPublisher to metadata module #20468
Conversation
Signed-off-by: see-quick <[email protected]>
Signed-off-by: see-quick <[email protected]>
Signed-off-by: see-quick <[email protected]>
see-quick
changed the title
| @@ -44,7 +44,7 @@ import org.apache.kafka.common.security.auth.SecurityProtocol | |||
| import org.apache.kafka.common.utils.{KafkaThread, LogContext, Time, Utils} | |||
| import org.apache.kafka.common.{Endpoint, KafkaException, MetricName, Reconfigurable} | |||
| import org.apache.kafka.network.{ConnectionQuotaEntity, ConnectionThrottledException, SocketServerConfigs, TooManyConnectionsException} | |||
| import org.apache.kafka.security.CredentialProvider | |||
| import org.apache.kafka.server.common.CredentialProvider | |||
There was a problem hiding this comment.
nit: We try to order import alphabetically, can we move this 1 line down?
There was a problem hiding this comment.
Interestingly, checkstyle allows such a change. Should we also update the spotless or checkstyle configuration to address this problem? :). In this PR, I will update it manually now, but for next time, to avoid it.
There was a problem hiding this comment.
I believe we don't enforce checkstyle on Scala code yet as it would fail on many files and fixing it would create a lot of noise.
| String deltaName = "MetadataDelta up to " + newImage.highestOffsetAndEpoch().offset(); | ||
| try { | ||
| // Apply changes to SCRAM credentials. | ||
| Optional.ofNullable(delta.scramDelta()).ifPresent(scramDelta -> { |
There was a problem hiding this comment.
If wonder if doing:
ScramDelta scramDelta = delta.scramDelta();
if (scramDelta != null) {is just more readable. WDYT?
metadata/src/main/java/org/apache/kafka/metadata/publisher/ScramPublisher.java
Outdated
Show resolved
Hide resolved
server-common/src/main/java/org/apache/kafka/server/common/CredentialProvider.java
Outdated
Show resolved
Hide resolved
| scramDelta.changes().forEach((mechanism, userChanges) -> { | ||
| userChanges.forEach((userName, change) -> { |
There was a problem hiding this comment.
In both cases, the body of the block is a single expression, so we can remove the brackets{ }
There was a problem hiding this comment.
Also, this could be added to checkstyle, I assume. Updated.
Signed-off-by: see-quick <[email protected]>
This PR moves the ScramPublisher class from the server metadata package
to the dedicated metadata module. During refactoring, I found out that I
also need to move the CredentialProvider interface to a more appropriate
location in the server common package because
CredentialProvideris inthe
servermodule, and I can't include that module in themetadatabecause I would create a circular dependency, i.e.,
server module ←-------------┐ ↓ (depends on). │
(which would make it circular) metadata module------------┘
So I have moved
CredentialProvidertoserver-commonmodule, andmetadatamodule has alreadyserver-commonand thus it's resolved.