#605 Add endpoint for async comparison calculation

scenarioo · Nov 30, 2017 · f9be21a · f9be21a
1 parent 124fefc
commit f9be21a
Show file tree

Hide file tree

Showing 6 changed files with 221 additions and 140 deletions.
diff --git a/scenarioo-server/src/main/java/org/scenarioo/business/builds/BuildImporter.java b/scenarioo-server/src/main/java/org/scenarioo/business/builds/BuildImporter.java
@@ -229,7 +229,7 @@ private void submitBuildForComparison(BuildIdentifier buildIdentifier) {
 		comparisonExecutor.doComparison(buildIdentifier.getBranchName(), buildIdentifier.getBuildName());
 	}
 
-	private Future<ComparisonResult> submitBuildForSingleComparison(BuildIdentifier buildIdentifier, BuildIdentifier compareBuildIdentifier, String comparisonName) {
+	public Future<ComparisonResult> submitBuildForSingleComparison(BuildIdentifier buildIdentifier, BuildIdentifier compareBuildIdentifier, String comparisonName) {
 		return comparisonExecutor.doComparison(buildIdentifier.getBranchName(), buildIdentifier.getBuildName(),
 			compareBuildIdentifier.getBranchName(), compareBuildIdentifier.getBuildName(), comparisonName);
 	}

diff --git a/scenarioo-server/src/main/java/org/scenarioo/business/builds/ScenarioDocuBuildsManager.java b/scenarioo-server/src/main/java/org/scenarioo/business/builds/ScenarioDocuBuildsManager.java
@@ -231,6 +231,10 @@ public Future<ComparisonResult> importBuildAndCreateComparison(final BuildIdenti
 		return buildImporter.importBuildAndCreateComparison(availableBuilds, buildIdentifier, comparisonBuildIdentifier, comparisonName);
 	}
 
+	public void submitBuildForSingleComparison(final BuildIdentifier buildIdentifier, final BuildIdentifier comparisonBuildIdentifier, String comparisonName) {
+		buildImporter.submitBuildForSingleComparison(buildIdentifier, comparisonBuildIdentifier, comparisonName);
+	}
+
 	public LongObjectNamesResolver getLongObjectNameResolver(final BuildIdentifier buildIdentifier) {
 		AggregatedDocuDataReader dao = new ScenarioDocuAggregationDao(
 				configurationRepository.getDocumentationDataDirectory());
@@ -256,8 +260,7 @@ public void validateBuildIsSuccessfullyImported(final String branchName, final S
 		}
 	}
 
-	public String getImportStatus(BuildIdentifier buildIdentifier) {
-		BuildImportStatus buildImportStatus = buildImporter.getBuildImportStatus(buildIdentifier);
-		return buildImportStatus != null ? buildImportStatus.name() : null;
+	public BuildImportStatus getImportStatus(BuildIdentifier buildIdentifier) {
+		return buildImporter.getBuildImportStatus(buildIdentifier);
 	}
 }