Merge "Fix sonar issues in SchemaGenerator"