refactoring post java
merge refactoring