Improved naming.

FelixRilling · Jun 18, 2023 · 7126bf4 · 7126bf4
1 parent 346c165
commit 7126bf4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/dev/rilling/musicbrainzenricher/MusicbrainzEnricherService.java b/src/main/java/dev/rilling/musicbrainzenricher/MusicbrainzEnricherService.java
@@ -32,13 +32,13 @@ public void runInAutoQueryMode(@NotNull DataType dataType) {
 		final WorkQueueRepository workQueueRepository = findBeanForDataType(dataType, WorkQueueRepository.class);
 		final AbstractEnrichmentService<?, ?> enrichmentService = findBeanForDataType(dataType, AbstractEnrichmentService.class);
 
-		long count = workQueueRepository.countFromWorkQueue();
+		long count = workQueueRepository.countWorkQueue();
 		while (count > 0) {
 			LOGGER.info("{} auto-query entities remaining.", count);
-			for (UUID mbid : workQueueRepository.findFromWorkQueue(AUTO_QUERY_CHUNK_SIZE)) {
+			for (UUID mbid : workQueueRepository.queryWorkQueue(AUTO_QUERY_CHUNK_SIZE)) {
 				executeEnrichment(dataType, mbid, enrichmentService);
 			}
-			count = workQueueRepository.countFromWorkQueue();
+			count = workQueueRepository.countWorkQueue();
 		}
 	}
 

diff --git a/src/main/java/dev/rilling/musicbrainzenricher/core/ReleaseGroupRepository.java b/src/main/java/dev/rilling/musicbrainzenricher/core/ReleaseGroupRepository.java
@@ -21,12 +21,12 @@ public class ReleaseGroupRepository implements WorkQueueRepository {
 	}
 
 	@Override
-	public long countFromWorkQueue() {
+	public long countWorkQueue() {
 		return Objects.requireNonNull(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM musicbrainz_enricher.release_group_work_queue", Long.class));
 	}
 
 	@Override
-	public @NotNull List<UUID> findFromWorkQueue(int limit) {
+	public @NotNull List<UUID> queryWorkQueue(int limit) {
 		List<UUID> mbids = jdbcTemplate.query("SELECT rg.gid FROM musicbrainz_enricher.release_group_work_queue rg LIMIT ?", (rs, rowNum) -> rs.getObject("gid", UUID.class), limit);
 		return Collections.unmodifiableList(mbids);
 	}

diff --git a/src/main/java/dev/rilling/musicbrainzenricher/core/ReleaseRepository.java b/src/main/java/dev/rilling/musicbrainzenricher/core/ReleaseRepository.java
@@ -20,13 +20,13 @@ public class ReleaseRepository implements WorkQueueRepository {
 	}
 
 	@Override
-	public long countFromWorkQueue() {
+	public long countWorkQueue() {
 		return Objects.requireNonNull(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM musicbrainz_enricher.release_work_queue", Long.class));
 	}
 
 
 	@Override
-	public @NotNull List<UUID> findFromWorkQueue(int limit) {
+	public @NotNull List<UUID> queryWorkQueue(int limit) {
 		List<UUID> mbids = jdbcTemplate.query("SELECT r.gid FROM musicbrainz_enricher.release_work_queue r LIMIT ?", (rs, rowNum) -> rs.getObject("gid", UUID.class), limit);
 		return Collections.unmodifiableList(mbids);
 	}

diff --git a/src/main/java/dev/rilling/musicbrainzenricher/core/WorkQueueRepository.java b/src/main/java/dev/rilling/musicbrainzenricher/core/WorkQueueRepository.java
@@ -6,7 +6,7 @@
 import java.util.UUID;
 
 public interface WorkQueueRepository extends DataTypeAware {
-	long countFromWorkQueue();
+	long countWorkQueue();
 
-	@NotNull List<UUID> findFromWorkQueue(int limit);
+	@NotNull List<UUID> queryWorkQueue(int limit);
 }