Introduce GraphNotFoundException in GraphStoreCatalog

Author: s1ck

core/src/main/java/org/neo4j/gds/core/loading/GraphNotFoundException.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.neo4j.gds.core.loading;
+
+import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
+
+public class GraphNotFoundException extends RuntimeException {
+    private final GraphStoreCatalog.UserCatalog.UserCatalogKey userCatalogKey;
+
+    GraphNotFoundException(GraphStoreCatalog.UserCatalog.UserCatalogKey userCatalogKey) {
+        super(
+            formatWithLocale(
+                "Graph with name `%s` does not exist on database `%s`. It might exist on another database.",
+                userCatalogKey.graphName(),
+                userCatalogKey.databaseName()
+            )
+        );
+        this.userCatalogKey = userCatalogKey;
+    }
+
+    public String graphName() {
+        return userCatalogKey.graphName();
+    }
+
+    public String databaseName() {
+        return userCatalogKey.databaseName();
+    }
+}

core/src/main/java/org/neo4j/gds/core/loading/GraphStoreCatalog.java

@@ -39,7 +39,6 @@
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
-import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
@@ -107,7 +106,7 @@ public static GraphStoreCatalogEntry get(CatalogRequest request, String graphNam
 
         if (usersWithMatchingGraphs.isEmpty()) {
             // suggests only own graphs names
-            throw ownCatalog.graphNotFoundException(userCatalogKey);
+            throw new GraphNotFoundException(userCatalogKey);
         }
 
         var usernames = StringJoining.joinVerbose(
@@ -151,7 +150,7 @@ public static void remove(
 
         if (usersWithMatchingGraphs.isEmpty() && failOnMissing) {
             // suggests only own graphs names
-            throw ownCatalog.graphNotFoundException(userCatalogKey);
+            throw new GraphNotFoundException(userCatalogKey);
         }
 
         if (usersWithMatchingGraphs.size() > 1) {
@@ -297,7 +296,8 @@ private static UserCatalog getUserCatalog(String username) {
         return userCatalogs.getOrDefault(username, UserCatalog.EMPTY);
     }
 
-    public record GraphStoreCatalogEntryWithUsername(GraphStoreCatalogEntry catalogEntry, String username) {}
+    public record GraphStoreCatalogEntryWithUsername(GraphStoreCatalogEntry catalogEntry, String username) {
+    }
 
     static class UserCatalog {
 
@@ -332,7 +332,11 @@ private void set(
                 throw new IllegalArgumentException("Both name and graph store must be not null");
             }
 
-            GraphStoreCatalogEntry graphStoreCatalogEntry = new GraphStoreCatalogEntry(graphStore, config, new EphemeralResultStore());
+            GraphStoreCatalogEntry graphStoreCatalogEntry = new GraphStoreCatalogEntry(
+                graphStore,
+                config,
+                new EphemeralResultStore()
+            );
 
             if (graphsByName.containsKey(userCatalogKey)) {
                 throw new IllegalStateException(
@@ -369,24 +373,13 @@ private void removeDegreeDistribution(UserCatalogKey userCatalogKey) {
             var graphStoreWithConfig = graphsByName.get(userCatalogKey);
 
             if (graphStoreWithConfig == null && failOnMissing) {
-                throw graphNotFoundException(userCatalogKey);
+                GraphNotFoundException result;
+                throw new GraphNotFoundException(userCatalogKey);
             }
 
             return graphStoreWithConfig;
         }
 
-        private NoSuchElementException graphNotFoundException(UserCatalogKey userCatalogKey) {
-            var graphName = userCatalogKey.graphName();
-
-            return new NoSuchElementException(
-                formatWithLocale(
-                    "Graph with name `%s` does not exist on database `%s`. It might exist on another database.",
-                    graphName,
-                    userCatalogKey.databaseName()
-                )
-            );
-        }
-
         private Optional<Map<String, Object>> getDegreeDistribution(UserCatalogKey userCatalogKey) {
             if (!graphsByName.containsKey(userCatalogKey)) {
                 return Optional.empty();

core/src/test/java/org/neo4j/gds/core/loading/GraphStoreCatalogServiceTest.java

@@ -29,14 +29,11 @@
 import org.neo4j.gds.api.User;
 import org.neo4j.gds.config.GraphProjectConfig;
 
-import java.util.NoSuchElementException;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -100,19 +97,13 @@ void shouldRespectFailFlag() {
             )
         );
 
-        try {
-            service.removeGraph(
-                CatalogRequest.of("some user", "some database"),
-                GraphName.parse("some graph"),
-                true
-            );
-
-            fail();
-        } catch (NoSuchElementException e) {
-            assertThat(e.getMessage()).isEqualTo(
-                "Graph with name `some graph` does not exist on database `some database`. It might exist on another database."
-            );
-        }
+        assertThatThrownBy(() -> service.removeGraph(
+            CatalogRequest.of("some user", "some database"),
+            GraphName.parse("some graph"),
+            true
+        )).isInstanceOf(GraphNotFoundException.class)
+            .hasMessageContaining(
+                "Graph with name `some graph` does not exist on database `some database`. It might exist on another database.");
     }
 
 }

core/src/test/java/org/neo4j/gds/core/loading/GraphStoreCatalogTest.java

@@ -31,7 +31,6 @@
 import org.neo4j.gds.extension.Inject;
 import org.neo4j.gds.gdl.GdlFactory;
 
-import java.util.NoSuchElementException;
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -429,15 +428,15 @@ void shouldThrowOnMissingGraph() {
         var dummyDatabaseId = DatabaseId.of("mydatabase");
 
         // test the get code path
-        assertThatExceptionOfType(NoSuchElementException.class)
+        assertThatExceptionOfType(GraphNotFoundException.class)
             .isThrownBy(() -> GraphStoreCatalog.get(
                 CatalogRequest.of(USER_NAME, dummyDatabaseId),
                 "myGraph"
             ))
             .withMessage("Graph with name `myGraph` does not exist on database `mydatabase`. It might exist on another database.");
 
         // test the drop code path
-        assertThatExceptionOfType(NoSuchElementException.class)
+        assertThatExceptionOfType(GraphNotFoundException.class)
             .isThrownBy(() -> GraphStoreCatalog.remove(
                 CatalogRequest.of(USER_NAME, dummyDatabaseId),
                 "myGraph",