Fix checkstyle issues in api-state-management