Skip to content

Commit 72a0146

Browse files
author
Jeen Broekstra
authored
Merge pull request #796 from jamesrdf/issues/#637-repo-id-warning
Fix #637: Prompt user if using incompatible chars in repository ID
2 parents b8a5668 + 2971d6d commit 72a0146

18 files changed

Lines changed: 38 additions & 28 deletions

File tree

core/console/src/main/java/org/eclipse/rdf4j/console/Create.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,14 @@ private void createRepository(final String templateName)
105105
() -> new RepositoryConfigException("missing repository node"));
106106
final RepositoryConfig repConfig = RepositoryConfig.create(graph, repositoryNode);
107107
repConfig.validate();
108-
boolean proceed = RepositoryConfigUtil.hasRepositoryConfig(systemRepo, repConfig.getID())
109-
? consoleIO.askProceed(
110-
"WARNING: you are about to overwrite the configuration of an existing repository!",
111-
false)
112-
: true;
113-
if (proceed) {
108+
String overwrite = "WARNING: you are about to overwrite the configuration of an existing repository!";
109+
boolean proceedOverwrite = RepositoryConfigUtil.hasRepositoryConfig(systemRepo,
110+
repConfig.getID()) ? consoleIO.askProceed(overwrite, false) : true;
111+
String suggested = this.state.getManager().getNewRepositoryID(repConfig.getID());
112+
String invalid = "WARNING: There are potentially incompatible characters in the repository id.";
113+
boolean proceedInvalid = !suggested.startsWith(repConfig.getID())
114+
? consoleIO.askProceed(invalid, false) : true;
115+
if (proceedInvalid && proceedOverwrite) {
114116
try {
115117
RepositoryConfigUtil.updateRepositoryConfigs(systemRepo, repConfig);
116118
consoleIO.writeln("Repository created");

core/http/workbench/src/main/webapp/scripts/add.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/http/workbench/src/main/webapp/scripts/create-federate.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/http/workbench/src/main/webapp/scripts/create.js

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/http/workbench/src/main/webapp/scripts/create.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/http/workbench/src/main/webapp/scripts/delete.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)