Extracted enricher lookup.

FelixRilling · Jun 18, 2023 · c42ffa4 · c42ffa4
1 parent 920b1af
commit c42ffa4
Showing 1 changed file with 8 additions and 20 deletions.
diff --git a/src/main/java/dev/rilling/musicbrainzenricher/MusicbrainzEnricherService.java b/src/main/java/dev/rilling/musicbrainzenricher/MusicbrainzEnricherService.java
@@ -21,33 +21,27 @@ public class MusicbrainzEnricherService {
 	private final MusicbrainzAutoQueryService musicbrainzAutoQueryService;
 	private final HistoryService historyService;
 
-	MusicbrainzEnricherService(ApplicationContext applicationContext,
-							   MusicbrainzAutoQueryService musicbrainzAutoQueryService,
-							   HistoryService historyService) {
+	MusicbrainzEnricherService(ApplicationContext applicationContext, MusicbrainzAutoQueryService musicbrainzAutoQueryService, HistoryService historyService) {
 		this.applicationContext = applicationContext;
 		this.musicbrainzAutoQueryService = musicbrainzAutoQueryService;
 		this.historyService = historyService;
 	}
 
 	public void runInAutoQueryMode(@NotNull DataType dataType) {
+		final AbstractEnrichmentService<?, ?> enrichmentService = findFittingEnrichmentService(dataType);
 		switch (dataType) {
-			case RELEASE -> musicbrainzAutoQueryService.autoQueryReleases(mbid -> executeEnrichment(
-				dataType,
-				mbid,
-				findFittingEnrichmentService(dataType)));
-			case RELEASE_GROUP -> musicbrainzAutoQueryService.autoQueryReleaseGroups(mbid -> executeEnrichment(dataType,
-				mbid,
-				findFittingEnrichmentService(dataType)));
+			case RELEASE ->
+				musicbrainzAutoQueryService.autoQueryReleases(mbid -> executeEnrichment(dataType, mbid, enrichmentService));
+			case RELEASE_GROUP ->
+				musicbrainzAutoQueryService.autoQueryReleaseGroups(mbid -> executeEnrichment(dataType, mbid, enrichmentService));
 		}
 	}
 
 	public void runInSingleMode(@NotNull DataType dataType, @NotNull UUID mbid) {
 		executeEnrichment(dataType, mbid, findFittingEnrichmentService(dataType));
 	}
 
-	private void executeEnrichment(@NotNull DataType dataType,
-								   @NotNull UUID mbid,
-								   AbstractEnrichmentService<?, ?> enrichmentService) {
+	private void executeEnrichment(@NotNull DataType dataType, @NotNull UUID mbid, AbstractEnrichmentService<?, ?> enrichmentService) {
 		LOGGER.info("Starting enrichment for {} '{}'.", dataType, mbid);
 		try {
 			enrichmentService.executeEnrichment(mbid);
@@ -61,12 +55,6 @@ private void executeEnrichment(@NotNull DataType dataType,
 
 	@NotNull
 	private AbstractEnrichmentService<?, ?> findFittingEnrichmentService(@NotNull DataType dataType) {
-		return applicationContext.getBeansOfType(AbstractEnrichmentService.class)
-			.values()
-			.stream()
-			.filter(enrichmentService -> enrichmentService.getDataType() == dataType)
-			.findFirst()
-			.orElseThrow(() -> new IllegalArgumentException("No enrichment service exists for data type '%s'.".formatted(
-				dataType)));
+		return applicationContext.getBeansOfType(AbstractEnrichmentService.class).values().stream().filter(enrichmentService -> enrichmentService.getDataType() == dataType).findFirst().orElseThrow(() -> new IllegalArgumentException("No enrichment service exists for data type '%s'.".formatted(dataType)));
 	}
 }