Update java code
Reviewing the Java code and fixing any inconsistencies.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Reviewing the Java code and fixing any inconsistencies.