Implement JavaTypeSubstitutor without PSI
Buildserver auto merge