modification to test
Modification to java generation process (based on EOL functions)
Modification to java util function