Use singular in count methods on catalogs

FlorentinD · s1ck · FlorentinD · commit f655b1e23f01 · 2022-11-24T14:09:57.000+01:00
F.i. `graphStoreCount`

Co-authored-by: Martin Junghanns &lt;martin.junghanns@neotechnology.com&gt;
diff --git a/core/src/main/java/org/neo4j/gds/core/loading/GraphStoreCatalog.java b/core/src/main/java/org/neo4j/gds/core/loading/GraphStoreCatalog.java
@@ -171,15 +171,15 @@ public static boolean exists(String username, DatabaseId databaseId, String grap
         return getUserCatalog(username).exists(UserCatalog.UserCatalogKey.of(databaseId, graphName));
     }
 
-    public static int graphStoresCount() {
+    public static int graphStoreCount() {
         return userCatalogs
             .values()
             .stream()
             .mapToInt(userCatalog -> userCatalog.getGraphStores().values().size())
             .sum();
     }
 
-    public static int graphStoresCount(DatabaseId databaseId) {
+    public static int graphStoreCount(DatabaseId databaseId) {
         return userCatalogs
             .values()
             .stream()
@@ -188,7 +188,7 @@ public static int graphStoresCount(DatabaseId databaseId) {
     }
 
     public static boolean isEmpty() {
-        return graphStoresCount() == 0;
+        return graphStoreCount() == 0;
     }
 
     public static Optional<Map<String, Object>> getDegreeDistribution(
diff --git a/core/src/main/java/org/neo4j/gds/core/utils/progress/EmptyTaskStore.java b/core/src/main/java/org/neo4j/gds/core/utils/progress/EmptyTaskStore.java
@@ -56,7 +56,7 @@ public boolean isEmpty() {
     }
 
     @Override
-    public long tasksCount() {
+    public long taskCount() {
         return 0;
     }
 
diff --git a/core/src/main/java/org/neo4j/gds/core/utils/progress/GlobalTaskStore.java b/core/src/main/java/org/neo4j/gds/core/utils/progress/GlobalTaskStore.java
@@ -89,7 +89,7 @@ public boolean isEmpty() {
     }
 
     @Override
-    public long tasksCount() {
+    public long taskCount() {
         return registeredTasks.values().stream().mapToLong(Map::size).sum();
     }
 }
diff --git a/core/src/main/java/org/neo4j/gds/core/utils/progress/TaskStore.java b/core/src/main/java/org/neo4j/gds/core/utils/progress/TaskStore.java
@@ -41,5 +41,5 @@ public interface TaskStore {
 
     boolean isEmpty();
 
-    long tasksCount();
+    long taskCount();
 }
diff --git a/core/src/test/java/org/neo4j/gds/core/loading/GraphStoreCatalogTest.java b/core/src/test/java/org/neo4j/gds/core/loading/GraphStoreCatalogTest.java
@@ -345,42 +345,42 @@ void removeAsAdminReturnsOnlyTheGraphFromTheOverrideEvenIfAGraphFromADifferentUs
 
     @Test
     void graphStoresCount() {
-        assertEquals(0, GraphStoreCatalog.graphStoresCount(DATABASE_ID));
+        assertEquals(0, GraphStoreCatalog.graphStoreCount(DATABASE_ID));
         GraphStoreCatalog.set(CONFIG, graphStore);
-        assertEquals(1, GraphStoreCatalog.graphStoresCount(DATABASE_ID));
+        assertEquals(1, GraphStoreCatalog.graphStoreCount(DATABASE_ID));
         GraphStoreCatalog.remove(
             CatalogRequest.of(USER_NAME, DATABASE_ID),
             GRAPH_NAME,
             graphStoreWithConfig -> {},
             true
         );
-        assertEquals(0, GraphStoreCatalog.graphStoresCount(DATABASE_ID));
+        assertEquals(0, GraphStoreCatalog.graphStoreCount(DATABASE_ID));
     }
 
     @Test
     void graphStoresCountAcrossUsers() {
-        assertEquals(0, GraphStoreCatalog.graphStoresCount());
+        assertEquals(0, GraphStoreCatalog.graphStoreCount());
         GraphStoreCatalog.set(CONFIG, graphStore);
-        assertEquals(1, GraphStoreCatalog.graphStoresCount());
+        assertEquals(1, GraphStoreCatalog.graphStoreCount());
         GraphStoreCatalog.set(GraphProjectFromStoreConfig.emptyWithName("bob", GRAPH_NAME), graphStore);
-        assertEquals(2, GraphStoreCatalog.graphStoresCount());
+        assertEquals(2, GraphStoreCatalog.graphStoreCount());
         GraphStoreCatalog.set(GraphProjectFromStoreConfig.emptyWithName("clive", GRAPH_NAME), graphStore);
-        assertEquals(3, GraphStoreCatalog.graphStoresCount());
+        assertEquals(3, GraphStoreCatalog.graphStoreCount());
         GraphStoreCatalog.remove(
             CatalogRequest.of(USER_NAME, DATABASE_ID),
             GRAPH_NAME,
             graphStoreWithConfig -> {},
             true
         );
-        assertEquals(2, GraphStoreCatalog.graphStoresCount());
+        assertEquals(2, GraphStoreCatalog.graphStoreCount());
     }
 
     @Test
     void removeAllLoadedGraphs() {
         GraphStoreCatalog.set(CONFIG, graphStore);
-        assertEquals(1, GraphStoreCatalog.graphStoresCount(DATABASE_ID));
+        assertEquals(1, GraphStoreCatalog.graphStoreCount(DATABASE_ID));
         GraphStoreCatalog.removeAllLoadedGraphs();
-        assertEquals(0, GraphStoreCatalog.graphStoresCount(DATABASE_ID));
+        assertEquals(0, GraphStoreCatalog.graphStoreCount(DATABASE_ID));
     }
 
     @Test
diff --git a/core/src/test/java/org/neo4j/gds/core/utils/progress/GlobalTaskStoreTest.java b/core/src/test/java/org/neo4j/gds/core/utils/progress/GlobalTaskStoreTest.java
@@ -48,14 +48,14 @@ void shouldCountAcrossUsers() {
         var taskStore = new GlobalTaskStore();
         taskStore.store("a", new JobId(), Tasks.leaf("v"));
 
-        assertThat(taskStore.tasksCount()).isEqualTo(1);
+        assertThat(taskStore.taskCount()).isEqualTo(1);
 
         taskStore.store("b", new JobId(), Tasks.leaf("x"));
 
-        assertThat(taskStore.tasksCount()).isEqualTo(2);
+        assertThat(taskStore.taskCount()).isEqualTo(2);
 
         taskStore.store("b", new JobId(), Tasks.leaf("y"));
 
-        assertThat(taskStore.tasksCount()).isEqualTo(3);
+        assertThat(taskStore.taskCount()).isEqualTo(3);
     }
 }
diff --git a/executor/src/main/java/org/neo4j/gds/executor/MemoryUsageValidator.java b/executor/src/main/java/org/neo4j/gds/executor/MemoryUsageValidator.java
@@ -130,7 +130,7 @@ private static void validateMemoryUsage(
             if (!GraphStoreCatalog.isEmpty()) {
                 errorMessage.add(formatWithLocale(
                     "Note: there are %s graphs currently loaded into memory.",
-                    GraphStoreCatalog.graphStoresCount()
+                    GraphStoreCatalog.graphStoreCount()
                 ));
             }
 
diff --git a/model-catalog-api/src/main/java/org/neo4j/gds/core/model/ModelCatalog.java b/model-catalog-api/src/main/java/org/neo4j/gds/core/model/ModelCatalog.java
@@ -44,7 +44,7 @@ <D, C extends ModelConfig, I extends ToMapConvertible> Model<D, C, I> get(
 
     Stream<Model<?, ?, ?>> getAllModels();
 
-    long modelsCount();
+    long modelCount();
 
     boolean exists(String username, String modelName);
 
diff --git a/open-model-catalog/src/main/java/org/neo4j/gds/core/model/OpenModelCatalog.java b/open-model-catalog/src/main/java/org/neo4j/gds/core/model/OpenModelCatalog.java
@@ -93,7 +93,7 @@ public <D, C extends ModelConfig, I extends ToMapConvertible> Model<D, C, I> get
     }
 
     @Override
-    public long modelsCount() {
+    public long modelCount() {
         return userCatalogs.values().stream().mapToLong(OpenUserCatalog::size).sum();
     }
 
diff --git a/open-model-catalog/src/test/java/org/neo4j/gds/core/model/OpenModelCatalogTest.java b/open-model-catalog/src/test/java/org/neo4j/gds/core/model/OpenModelCatalogTest.java
@@ -183,19 +183,19 @@ void shouldCountModels() {
             Map::of
         );
 
-        assertThat(modelCatalog.modelsCount()).isEqualTo(0);
+        assertThat(modelCatalog.modelCount()).isEqualTo(0);
 
         modelCatalog.set(model1);
 
-        assertThat(modelCatalog.modelsCount()).isEqualTo(1);
+        assertThat(modelCatalog.modelCount()).isEqualTo(1);
 
         modelCatalog.set(model2);
 
-        assertThat(modelCatalog.modelsCount()).isEqualTo(2);
+        assertThat(modelCatalog.modelCount()).isEqualTo(2);
 
         modelCatalog.set(publicModel);
 
-        assertThat(modelCatalog.modelsCount()).isEqualTo(3);
+        assertThat(modelCatalog.modelCount()).isEqualTo(3);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -171,15 +171,15 @@ public static boolean exists(String username, DatabaseId databaseId, String grap`
`171`	`171`	`return getUserCatalog(username).exists(UserCatalog.UserCatalogKey.of(databaseId, graphName));`
`172`	`172`	`}`
`173`	`173`
`174`		`- public static int graphStoresCount() {`
	`174`	`+ public static int graphStoreCount() {`
`175`	`175`	`return userCatalogs`
`176`	`176`	`.values()`
`177`	`177`	`.stream()`
`178`	`178`	`.mapToInt(userCatalog -> userCatalog.getGraphStores().values().size())`
`179`	`179`	`.sum();`
`180`	`180`	`}`
`181`	`181`
`182`		`- public static int graphStoresCount(DatabaseId databaseId) {`
	`182`	`+ public static int graphStoreCount(DatabaseId databaseId) {`
`183`	`183`	`return userCatalogs`
`184`	`184`	`.values()`
`185`	`185`	`.stream()`
`@@ -188,7 +188,7 @@ public static int graphStoresCount(DatabaseId databaseId) {`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`public static boolean isEmpty() {`
`191`		`- return graphStoresCount() == 0;`
	`191`	`+ return graphStoreCount() == 0;`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`public static Optional<Map<String, Object>> getDegreeDistribution(`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public boolean isEmpty() {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Override`
`59`		`- public long tasksCount() {`
	`59`	`+ public long taskCount() {`
`60`	`60`	`return 0;`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public boolean isEmpty() {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@Override`
`92`		`- public long tasksCount() {`
	`92`	`+ public long taskCount() {`
`93`	`93`	`return registeredTasks.values().stream().mapToLong(Map::size).sum();`
`94`	`94`	`}`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@ public interface TaskStore {`
`41`	`41`
`42`	`42`	`boolean isEmpty();`
`43`	`43`
`44`		`- long tasksCount();`
	`44`	`+ long taskCount();`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,14 +48,14 @@ void shouldCountAcrossUsers() {`
`48`	`48`	`var taskStore = new GlobalTaskStore();`
`49`	`49`	`taskStore.store("a", new JobId(), Tasks.leaf("v"));`
`50`	`50`
`51`		`- assertThat(taskStore.tasksCount()).isEqualTo(1);`
	`51`	`+ assertThat(taskStore.taskCount()).isEqualTo(1);`
`52`	`52`
`53`	`53`	`taskStore.store("b", new JobId(), Tasks.leaf("x"));`
`54`	`54`
`55`		`- assertThat(taskStore.tasksCount()).isEqualTo(2);`
	`55`	`+ assertThat(taskStore.taskCount()).isEqualTo(2);`
`56`	`56`
`57`	`57`	`taskStore.store("b", new JobId(), Tasks.leaf("y"));`
`58`	`58`
`59`		`- assertThat(taskStore.tasksCount()).isEqualTo(3);`
	`59`	`+ assertThat(taskStore.taskCount()).isEqualTo(3);`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ private static void validateMemoryUsage(`
`130`	`130`	`if (!GraphStoreCatalog.isEmpty()) {`
`131`	`131`	`errorMessage.add(formatWithLocale(`
`132`	`132`	`"Note: there are %s graphs currently loaded into memory.",`
`133`		`- GraphStoreCatalog.graphStoresCount()`
	`133`	`+ GraphStoreCatalog.graphStoreCount()`
`134`	`134`	`));`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public <D, C extends ModelConfig, I extends ToMapConvertible> Model<D, C, I> get`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`@Override`
`96`		`- public long modelsCount() {`
	`96`	`+ public long modelCount() {`
`97`	`97`	`return userCatalogs.values().stream().mapToLong(OpenUserCatalog::size).sum();`
`98`	`98`	`}`
`99`	`99`