Merge "Fixed Sonar Issues in NodeClass.java"