Revert workaround for Java 8 `ConcurrentHashMap` bug

[manasjoshi14]

I believe we can revert the changes done in this PR for this issue DATACMNS-1396. This change was done for a bug in java 8 and latest spring versions require java 17+

[mp911de]

Good catch, it makes sense to improve our code.