chore(Refactoring): Removed Rebellious Hierarchy smell by introducing Parsable Interface

Author: Siva-2707

src/Designite/SourceModel/Parsable.java

@@ -0,0 +1,5 @@
+package Designite.SourceModel;
+
+public interface Parsable {
+    void parse();
+}

src/Designite/SourceModel/SM_EntitiesWithType.java

@@ -54,8 +54,8 @@ public String getTypeOverallToString() {
 //			return "generic";
 	}
 
-	@Override
-	public void parse() {
-		
-	}
+//	@Override
+//	public void parse() {
+//
+//	}
 }

src/Designite/SourceModel/SM_Method.java

@@ -17,7 +17,7 @@
 import Designite.visitors.InstanceOfVisitor;
 import Designite.visitors.ThrowVisitor;
 
-public class SM_Method extends SM_SourceItem implements Vertex {
+public class SM_Method extends SM_SourceItem implements Vertex, Parsable {
 
 	private boolean abstractMethod;
 	private boolean finalMethod;
@@ -131,11 +131,12 @@ private void prepareParametersList(SingleVariableDeclaration var) {
 		}
 	}
 
-	private void parseParameters() {
-		for (SM_Parameter param : parameterList) {
-			param.parse();
-		}
-	}
+	//SM_Parameter uses an empty parse method. So commenting this.
+//	private void parseParameters() {
+//		for (SM_Parameter param : parameterList) {
+//			param.parse();
+//		}
+//	}
 
 	private void prepareLocalVarList() {
 		LocalVarVisitor localVarVisitor = new LocalVarVisitor(this);
@@ -146,11 +147,12 @@ private void prepareLocalVarList() {
 		}
 	}
 
-	private void parseLocalVar() {
-		for (SM_LocalVar var : localVarList) {
-			var.parse();
-		}
-	}
+//SM_LocalVar inherits SM_EntitiesWithType which inter uses an empty parse method. So, commenting this.
+//	private void parseLocalVar() {
+//		for (SM_LocalVar var : localVarList) {
+//			var.parse();
+//		}
+//	}
 
 	public String getMethodBody() {
 		if (this.hasBody())
@@ -187,11 +189,11 @@ public void parse() {
 		List<SingleVariableDeclaration> variableList = methodDeclaration.parameters();
 		for (SingleVariableDeclaration var : variableList) {
 			prepareParametersList(var);
-			parseParameters();
+//			parseParameters();
 		}
 
 		prepareLocalVarList();
-		parseLocalVar();
+//		parseLocalVar();
 
 		DirectAceessFieldVisitor directAceessFieldVisitor = new DirectAceessFieldVisitor();
 		methodDeclaration.accept(directAceessFieldVisitor);

src/Designite/SourceModel/SM_Package.java

@@ -17,7 +17,7 @@
 import Designite.utils.Constants;
 import Designite.utils.models.Edge;
 
-public class SM_Package extends SM_SourceItem {
+public class SM_Package extends SM_SourceItem implements Parsable{
 	private List<CompilationUnit> compilationUnitList;
 	private List<SM_Type> typeList = new ArrayList<>();
 	private SM_Project parentProject;

src/Designite/SourceModel/SM_Parameter.java

@@ -58,9 +58,9 @@ public String toString() {
 				+ ", is=" + getTypeBinding().getNodeType();
 	}
 
-	@Override
-	public void parse() {
-		
-	}
+//	@Override
+//	public void parse() {
+//
+//	}
 
 }

src/Designite/SourceModel/SM_Project.java

@@ -20,7 +20,7 @@
 import Designite.utils.Logger;
 import Designite.utils.models.Graph;
 
-public class SM_Project extends SM_SourceItem {
+public class SM_Project extends SM_SourceItem implements Parsable {
 
 	private InputArgs inputArgs;
 	private List<String> sourceFileList;

src/Designite/SourceModel/SM_SourceItem.java

@@ -19,7 +19,7 @@ public abstract class SM_SourceItem {
 	/**
 	 * This is the first pass of parsing a source code entity.
 	 */
-	public abstract void parse();
+//	public abstract void parse();
 
 	/**
 	 * This method establishes relationships among source-code entities. Such

src/Designite/SourceModel/SM_Type.java

@@ -25,7 +25,7 @@
 import Designite.visitors.StaticFieldAccessVisitor;
 
 //TODO check EnumDeclaration, AnnotationTypeDeclaration and nested classes
-public class SM_Type extends SM_SourceItem implements Vertex {
+public class SM_Type extends SM_SourceItem implements Vertex, Parsable {
 
 
 	private boolean isAbstract = false;
@@ -221,11 +221,12 @@ private void parseMethods() {
 		}
 	}
 
-	private void parseFields() {
-		for (SM_Field field : fieldList) {
-			field.parse();
-		}
-	}
+	//SM_Field inherits SM_EntitiesWithType which inter uses an empty parse method. So, commenting this.
+//	private void parseFields() {
+//		for (SM_Field field : fieldList) {
+//			field.parse();
+//		}
+//	}
 
 	@Override
 	public void printDebugLog(PrintWriter writer) {
@@ -263,7 +264,7 @@ public void parse() {
 		List<SM_Field> fList = fieldVisitor.getFields();
 		if (fList.size() > 0)
 			fieldList.addAll(fList);
-		parseFields();
+//		parseFields();
 
 		StaticFieldAccessVisitor fieldAccessVisitor = new StaticFieldAccessVisitor();
 		typeDeclaration.accept(fieldAccessVisitor);

tests/DesigniteTests/DesigniteTests/SM_PackageTest.java

@@ -30,7 +30,8 @@ public void SM_Package_positive_case() {
 			if (pkg.getName().equals("Designite"))
 				assertEquals(pkg.getTypeList().size(), 2);
 			if (pkg.getName().equals("Designite.SourceModel"))
-				assertEquals(20, pkg.getTypeList().size());
+				//Added additional class in the package.
+				assertEquals(21, pkg.getTypeList().size());
 		}
 	}