[#2349] Improvement: Fix the warning: unchecked method invocation: method put in interface Map is applied to given types

[#2349] Improvement: Fix the warning: unchecked method invocation: method put in interface Map is applied to given types #3527