Further improve annotation generation

[snake14]

Description

This is making some more improvements to the annotation generator, including adding to the very limited test coverage.

Issue No

PG-4502

Steps to Replicate the Issue

1. Check out the branch
2. Generate annotations for a plugin, like CustomDimensions.
3. Generate a spec file for the plugin.
4. Preview the generated spec file using the SwaggerUI preview mode in PHPStorm

Checklist

• [✔] Tested locally or on demo2/demo3?
• [✔] New test case added/updated?
• [NA] Are all newly added texts included via translation?
• [NA] Are text sanitized properly? (Eg use of v-text v/s v-html for vue)
• [✖] Version bumped?

[AltamashShaikh]

Looks good to me

[snake14]

Thank you for the review @AltamashShaikh . Apologies for the large PR.