Fix for #1343

[hariohmprasath]

Fix to check for both iterable and generic type before proceeding.

• [x] You have read the Spring Data contribution guidelines.
• [x] You use the code formatters provided here and have them applied to your changes. Don’t submit any formatting related changes.
• [x] You submit test cases (unit or integration tests) that back your changes.
• [x] You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).

[schauder]

Please add at least one test exercising this code.

[loolzaaa]

I think it is also necessary to take into account improvements for #1323

[schauder]

Closing this in favor of #1356