chore(Refactoring): Resolved Insufficent modularization smell in TypeMetrics class

Author: Siva-2707

src/Designite/SourceModel/SM_Package.java

@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
+import Designite.metrics.TypeMetricsExtractor;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 
 import Designite.InputArgs;
@@ -117,8 +118,7 @@ public void resolve() {
 	public void extractTypeMetrics() {
 		for (SM_Type type : typeList) {
 			type.extractMethodMetrics();
-			TypeMetrics metrics = new TypeMetrics(type);
-			metrics.extractMetrics();
+			TypeMetrics metrics = new TypeMetricsExtractor(type).extractMetrics();
 			metricsMapping.put(type, metrics);
 			exportMetricsToCSV(metrics, type.getName());
 			updateDependencyGraph(type);

src/Designite/SourceModel/SM_Type.java

@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
+import Designite.metrics.MethodMetricsExtractor;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.dom.ImportDeclaration;
 import org.eclipse.jdt.core.dom.Modifier;
@@ -350,8 +351,7 @@ private void addUniqueReference(SM_Type type, SM_Type typeToAdd, boolean invardR
 
 	public void extractMethodMetrics() {
 		for (SM_Method method : methodList) {
-			MethodMetrics metrics = new MethodMetrics(method);
-			metrics.extractMetrics();
+			MethodMetrics metrics = new MethodMetricsExtractor(method).extractMetrics();
 			metricsMapping.put(method, metrics);
 			exportMethodMetricsToCSV(metrics, method.getName());
 		}

src/Designite/metrics/MethodMetrics.java

@@ -5,60 +5,14 @@
 import Designite.SourceModel.SM_Field;
 import Designite.SourceModel.SM_Method;
 import Designite.SourceModel.SM_Type;
-import Designite.visitors.MethodControlFlowVisitor;
 
-public class MethodMetrics implements MetricExtractor {
+public class MethodMetrics extends Metrics {
 
 	private int numOfParameters;
 	private int cyclomaticComplexity;
 	private int numOfLines;
-	
 	private SM_Method method;
-	
-	public MethodMetrics(SM_Method method) {
-		this.method = method;
-	}
-	
-	@Override
-	public void extractMetrics() {
-		extractNumOfParametersMetrics();
-		extractCyclomaticComplexity();
-		extractNumberOfLines();
-	}
-	
-	private void extractNumOfParametersMetrics() {
-		numOfParameters = method.getParameterList().size();
-	}
-	
-	private void extractCyclomaticComplexity() {
-		cyclomaticComplexity = calculateCyclomaticComplexity();
-	}
-	
-	private int calculateCyclomaticComplexity() {
-		MethodControlFlowVisitor visitor = new MethodControlFlowVisitor();
-		method.getMethodDeclaration().accept(visitor);
-		return visitor.getNumOfIfStatements()
-			 + visitor.getNumOfSwitchCaseStatementsWitoutDefault()
-			 + visitor.getNumOfForStatements()
-			 + visitor.getNumOfWhileStatements()
-		     + visitor.getNumOfDoStatements()
-			 + visitor.getNumOfForeachStatements()
-			 + 1;
-	}
-	
-	private void extractNumberOfLines() {
-		if (methodHasBody()) {
-			String body = method.getMethodDeclaration().getBody().toString();
-			int length = body.length();
-//			long newlines = body.lines().count();
-			numOfLines = length - body.replace("\n", "").length();
-		}
-	}
-	
-	private boolean methodHasBody() {
-		return method.getMethodDeclaration().getBody() != null;
-	}
-	
+
 	public int getNumOfParameters() {
 		return numOfParameters;
 	}
@@ -71,16 +25,32 @@ public int getNumOfLines() {
 		return numOfLines;
 	}
 
+	public void setNumOfParameters(int numOfParameters) {
+		this.numOfParameters = numOfParameters;
+	}
+
+	public void setCyclomaticComplexity(int cyclomaticComplexity) {
+		this.cyclomaticComplexity = cyclomaticComplexity;
+	}
+
+	public void setNumOfLines(int numOfLines) {
+		this.numOfLines = numOfLines;
+	}
+
+	public void setMethod(SM_Method method){
+		this.method = method;
+	}
+
+	public SM_Method getMethod() {
+		return method;
+	}
+
 	public List<SM_Field> getDirectFieldAccesses() {
 		return method.getDirectFieldAccesses();
 	}
-	
+
 	public List<SM_Type> getSMTypesInInstanceOf() {
 		return method.getSMTypesInInstanceOf();
 	}
-	
-	public SM_Method getMethod() {
-		return method;
-	}
 
 }

src/Designite/metrics/MethodMetricsExtractor.java

@@ -0,0 +1,65 @@
+package Designite.metrics;
+
+import Designite.SourceModel.SM_Method;
+import Designite.SourceModel.SM_Type;
+import Designite.visitors.MethodControlFlowVisitor;
+
+import java.util.List;
+
+public class MethodMetricsExtractor implements MetricExtractor{
+
+    private SM_Method method;
+    private MethodMetrics methodMetrics;
+
+    public MethodMetricsExtractor(SM_Method method) {
+        this.method = method;
+    }
+
+    @Override
+    public MethodMetrics extractMetrics() {
+        methodMetrics = new MethodMetrics();
+        extractNumOfParametersMetrics();
+        extractCyclomaticComplexity();
+        extractNumberOfLines();
+        methodMetrics.setMethod(method);
+        return methodMetrics;
+    }
+
+
+    private void extractNumOfParametersMetrics() {
+       methodMetrics.setNumOfParameters(method.getParameterList().size());
+    }
+
+    private void extractCyclomaticComplexity() {
+        methodMetrics.setCyclomaticComplexity(calculateCyclomaticComplexity());
+    }
+
+    private int calculateCyclomaticComplexity() {
+        MethodControlFlowVisitor visitor = new MethodControlFlowVisitor();
+        method.getMethodDeclaration().accept(visitor);
+        return visitor.getNumOfIfStatements()
+                + visitor.getNumOfSwitchCaseStatementsWitoutDefault()
+                + visitor.getNumOfForStatements()
+                + visitor.getNumOfWhileStatements()
+                + visitor.getNumOfDoStatements()
+                + visitor.getNumOfForeachStatements()
+                + 1;
+    }
+
+    private void extractNumberOfLines() {
+        if (methodHasBody()) {
+            String body = method.getMethodDeclaration().getBody().toString();
+            int length = body.length();
+//			long newlines = body.lines().count();
+            methodMetrics.setNumOfLines(length - body.replace("\n", "").length());
+        }
+    }
+
+    private boolean methodHasBody() {
+        return method.getMethodDeclaration().getBody() != null;
+    }
+
+
+
+
+}

src/Designite/metrics/MetricExtractor.java

@@ -2,5 +2,5 @@
 
 public interface MetricExtractor {
 
-	void extractMetrics();
+	Metrics extractMetrics();
 }

src/Designite/metrics/Metrics.java

@@ -0,0 +1,4 @@
+package Designite.metrics;
+
+public class Metrics {
+}