Merge "Fixed Sonar issues in NodeClass.java"