Code needs some improvements, like try-with-resources, diamond, static methods, final fields, etc.