Prune class TestTool

Author: mhdirkse

ladybug-common/src/main/java/org/wearefrank/ladybug/TestTool.java

@@ -105,7 +105,7 @@ public class TestTool {
 	private @Setter @Getter @Inject @Autowired Views views;
 	private @Setter @Getter int reportsInProgressThreshold = 300000;
 	boolean devMode = false; // See testConcurrentLastEndpointAndFirstStartpointForSameCorrelationId()
-    private @Setter String openTelemetryEndpoint;
+	private @Setter String openTelemetryEndpoint;
 	private Tracer tracer;
 
 	private @Getter @Setter String host = null;
@@ -144,7 +144,7 @@ public void reset() {
 		reportGeneratorEnabled = defaultReportGeneratorEnabled;
 	}
 
-    public void setSecurityLoggerName(String securityLoggerName) {
+	public void setSecurityLoggerName(String securityLoggerName) {
 		securityLog = LoggerFactory.getLogger(securityLoggerName);
 	}
 
@@ -366,33 +366,17 @@ private <T> T checkpoint(String correlationId, String childThreadId, String sour
 				matchingStubStrategies, checkpointType, levelChangeNextCheckpoint, true);
 	}
 
-	private <T> T checkpoint(String correlationId, String childThreadId, String sourceClassName, String name,
-							 T message, Map<String, Object> messageContext, StubableCode stubableCode, StubableCodeThrowsException stubableCodeThrowsException,
-							 Set<String> matchingStubStrategies, int checkpointType, int levelChangeNextCheckpoint) {
-		return checkpoint(correlationId, childThreadId, sourceClassName, name,
-				message, messageContext, stubableCode, stubableCodeThrowsException,
-				matchingStubStrategies, checkpointType, levelChangeNextCheckpoint, true);
-	}
-
-	private <T> T checkpoint(String correlationId, String childThreadId, String sourceClassName, String name,
-							 T message, StubableCode stubableCode, StubableCodeThrowsException stubableCodeThrowsException,
-							 Set<String> matchingStubStrategies, int checkpointType, int levelChangeNextCheckpoint, boolean shouldBeRerunnable) {
-		return checkpoint(correlationId, childThreadId, sourceClassName, name,
-				message, null, stubableCode, stubableCodeThrowsException,
-				matchingStubStrategies, checkpointType, levelChangeNextCheckpoint, shouldBeRerunnable);
-	}
-
 	private <T> T checkpoint(String correlationId, String childThreadId, String sourceClassName, String name,
 			T message, Map<String, Object> messageContext, StubableCode stubableCode, StubableCodeThrowsException stubableCodeThrowsException,
-			Set<String> matchingStubStrategies, int checkpointType, int levelChangeNextCheckpoint, boolean shouldBeRerunnable) {
+			Set<String> matchingStubStrategies, int checkpointType, int levelChangeNextCheckpoint) {
 		boolean executeStubableCode = true;
 		if (reportGeneratorEnabled) {
 			Report report;
 			// Blocking for all threads for all reports
 			synchronized(reportsInProgress) {
 				report = getReportInProgress(correlationId);
 				if (report == null) {
-					report = createReport(correlationId, name, checkpointType, shouldBeRerunnable);
+					report = createReport(correlationId, name, checkpointType);
 				}
 			}
 			if (devMode) randomSleep();
@@ -412,7 +396,7 @@ private <T> T checkpoint(String correlationId, String childThreadId, String sour
 						synchronized(reportsInProgress) {
 							report = getReportInProgress(correlationId);
 							if (report == null) {
-								report = createReport(correlationId, name, checkpointType, shouldBeRerunnable);
+								report = createReport(correlationId, name, checkpointType);
 							}
 						}
 						// Synchronize and check isClosed() on report again as it will now point to a different report
@@ -433,7 +417,7 @@ private <T> T checkpoint(String correlationId, String childThreadId, String sour
 		return message;
 	}
 
-	private Report createReport(String correlationId, String name, int checkpointType, boolean shouldBeRerunnable) {
+	private Report createReport(String correlationId, String name, int checkpointType) {
 		Report report = null;
 		if (checkpointType == CheckpointType.STARTPOINT.toInt()) {
 			log.debug("Create new report for '" + correlationId + "'");
@@ -453,7 +437,6 @@ private Report createReport(String correlationId, String name, int checkpointTyp
 					report.setReportFilterMatching(false);
 				}
 			}
-			report.setRerunnable(shouldBeRerunnable);
 			Report originalReport;
 			synchronized(originalReports) {
 				originalReport = (Report)originalReports.remove(correlationId);
@@ -569,11 +552,6 @@ public <T> T startpoint(String correlationId, String sourceClassName, String nam
 				CheckpointType.STARTPOINT.toInt(), 1);
 	}
 
-	public <T> T startpoint(String correlationId, String sourceClassName, String name, T message, boolean shouldBeRerunnable) {
-		return checkpoint(correlationId, null, sourceClassName, name, message, null, null, null,
-				CheckpointType.STARTPOINT.toInt(), 1, shouldBeRerunnable);
-	}
-
 	public <T> T startpoint(String correlationId, String sourceClassName, String name, T message, Map<String, Object> messageContext) {
 		return checkpoint(correlationId, null, sourceClassName, name, message, messageContext, null, null, null,
 				CheckpointType.STARTPOINT.toInt(), 1);