-
Notifications
You must be signed in to change notification settings - Fork 161
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
0b37d32
commit 9257829
Showing
11 changed files
with
118 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
...re-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/ExportLocation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * 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.applications.graphstorecatalog; | ||
|
|
||
| import java.nio.file.Path; | ||
| import java.util.Optional; | ||
|
|
||
| /** | ||
| * There are two flavours of usage: you get the path or die trying; or, | ||
| * you get the path and inquire if it is configured. Either case, errors are injected. | ||
| */ | ||
| public interface ExportLocation { | ||
| Path getAcceptingError(); | ||
|
|
||
| Optional<Path> getAcceptingNull(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
...integration/src/main/java/org/neo4j/gds/procedures/integration/DefaultExportLocation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * 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.procedures.integration; | ||
|
|
||
| import org.neo4j.gds.applications.graphstorecatalog.ExportLocation; | ||
| import org.neo4j.gds.logging.Log; | ||
| import org.neo4j.gds.settings.GdsSettings; | ||
| import org.neo4j.graphdb.config.Configuration; | ||
|
|
||
| import java.nio.file.Path; | ||
| import java.util.Optional; | ||
|
|
||
| import static org.neo4j.gds.utils.StringFormatting.formatWithLocale; | ||
|
|
||
| public final class DefaultExportLocation implements ExportLocation { | ||
| private final Log log; | ||
| private final Configuration neo4jConfiguration; | ||
|
|
||
| public DefaultExportLocation(Log log, Configuration neo4jConfiguration) { | ||
| this.log = log; | ||
| this.neo4jConfiguration = neo4jConfiguration; | ||
| } | ||
|
|
||
| @Override | ||
| public Path getAcceptingError() { | ||
| var exportLocation = neo4jConfiguration.get(GdsSettings.exportLocation()); | ||
|
|
||
| if (exportLocation == null) throw new IllegalStateException(formatWithLocale( | ||
| "The configuration '%s' needs to be set.", | ||
| GdsSettings.exportLocation().name() | ||
| )); | ||
|
|
||
| return exportLocation; | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<Path> getAcceptingNull() { | ||
| var exportLocation = neo4jConfiguration.get(GdsSettings.exportLocation()); | ||
|
|
||
| if (exportLocation == null) log.warn( | ||
| "[gds] The configuration %s is missing.", | ||
| GdsSettings.exportLocation().name() | ||
| ); | ||
|
|
||
| return Optional.ofNullable(exportLocation); | ||
| } | ||
| } |
48 changes: 0 additions & 48 deletions
48
...edures/integration/src/main/java/org/neo4j/gds/procedures/integration/ExportLocation.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.