Reuse Util.decodeFromBase64

[MichaelMorrisEst]

Type of change

Refactoring

Description

Refactor to make use of Util.decodeFromBase64 to reduce code duplication.

Closes #9745

Checklist

Please go through this checklist and make sure all applicable tasks have been done

• Write tests
• Make sure all tests pass
• Update documentation
• Check RBAC rights for Kubernetes / OpenShift roles
• Try your changes from Pod inside your Kubernetes and OpenShift cluster, not just locally
• Reference relevant issue(s) and close them after merging
• Update CHANGELOG.md
• Supply screenshots for visual changes, such as Grafana dashboards

[scholzj]

/azp run regression

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[scholzj]

Thanks for the PR. The changes look good to me.

[fvaleri]

Thanks for working on this.

I see that there are few missing replacements in the following classes:

• KafkaUserModelTest
• ListenersST

I was also wondering if we should create overloaded methods to cover cases where it takes or return a byte array. Same for the encoding method. This would be a different PR though. Wdyt?

[scholzj]

@fvaleri Let's take it step by step to avoid having huge and big PRs full of conflicts and taking a long time to handle.

[fvaleri]

@fvaleri Let's take it step by step to avoid having huge and big PRs full of conflicts and taking a long time to handle.

Sure, they could be multiple PRs.

[MichaelMorrisEst]

I deliberately excluded the occurrences in KafkaUserModelTest and ListenersST as, unlike the other cases, the charset used in the String constructor is not specified (i.e. the platform's default charset is used)

Perhaps it is ok to use decodeFromBase64(String data) resulting in US_ASCII now being used in these places?

Or perhaps I should:

• change decodeFromBase64(String data) to not specify the charset in the String constructor, i.e. no longer use US_ASCII by default
• use that in KafkaUserModelTest and ListenersST, so behaviour is as today
• use decodeFromBase64(String data, Charset charset) with US_ASCII as charset everywhere decodeFromBase64(String data) is currently used

[scholzj]

I think that in KafkaUSerModelTest, US_ASCII should be fine. I think it is the same in the case where a String is created from base64 in ListenersST.

[scholzj]

/azp run regression

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[fvaleri]

LGTM. Thanks.

[ppatierno]

LGTM. Thanks for the PR!

[MichaelMorrisEst]

Thanks for taking the time to review, I can also look at creating issues/PRs for the comment above by @fvaleri on also having methods for byte[], taking it one piece at a time

[scholzj]

Thanks for taking the time to review, I can also look at creating issues/PRs for the comment above by @fvaleri on also having methods for byte[], taking it one piece at a time

Sure, feel free to look into it if you want.