Glad to see the same pull request as mine. I think your changes are better than mine. I see the main difference is related to Map, <?,?> instead of <String,?>: I thought that JSON keys had to be strings, but if you accept any object you can always convert it to string by toString() method as you generate JSON key, much more flexible.

If you agree I'll close my pull request and keep yours.

@domusofsail
I believe toString is meant for human eyes only and is not supposed to be used for anything except visual output. And yes, believe JSON objects are always required to have strings for the key, so allowing any object to be input would be breaking the definition of JSON (feel free to correct anything and everything I will doible check this when I have time).

The perception that keys have to be strings in JSON surely is correct.
The opinion that toString() is just for human eyes is somewhat debateable.
My reasons of using Map<?,?> instead of Map<String,?> were the following:

• Provide a maximum level of flexibility for the API user.
• Keep it simple. The values in a Map<String,?> could themselves contain (among others) Maps (which recursively would again need to be Map<String,?>)
  I am not aware of any simple and convenient way to express that restriction.
• Uniformity. E.g. since collections of arbitrary objects are allowed to create a JSONArray, arbitrary maps should be handled in an appropriate way.

Maybe we could settle for something like the following comment/javadoc in the methods accepting a Map<?,?>:

The keys of the Map parameter are usually strings, if not, then the keys toString() implementation will be used to derive a proper JSON key.

I believe there are 2 points to consider:

• toString() is just for human eyes: if true we'll have to accept <String,?>, but my opinion is that this is mostly a philosophical issue
• will Map<String,?> break compatibility with older code which used Map only constructor? Yes, I checked the code and before generics a Map<Object,Object> was accepted and the key was already generated by toString() in the JSONObject.write() method (line writer.write(quote(key.toString()));)

So my vote is for @mdobrovnik solution to accept Map<?,?> and put a comment into javadoc regarding toString().

Added the comments.

Please see the README.