Merge branch 'master' into issues/#739-spin-lucene

Signed-off-by: Jacek Grzebyta <grzebyta.dev@gmail.com>

Author: jgrzebyta

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

@@ -105,12 +105,14 @@ private void createRepository(final String templateName)
 									() -> new RepositoryConfigException("missing repository node"));
 					final RepositoryConfig repConfig = RepositoryConfig.create(graph, repositoryNode);
 					repConfig.validate();
-					boolean proceed = RepositoryConfigUtil.hasRepositoryConfig(systemRepo, repConfig.getID())
-							? consoleIO.askProceed(
-									"WARNING: you are about to overwrite the configuration of an existing repository!",
-									false)
-							: true;
-					if (proceed) {
+					String overwrite = "WARNING: you are about to overwrite the configuration of an existing repository!";
+					boolean proceedOverwrite = RepositoryConfigUtil.hasRepositoryConfig(systemRepo,
+							repConfig.getID()) ? consoleIO.askProceed(overwrite, false) : true;
+					String suggested = this.state.getManager().getNewRepositoryID(repConfig.getID());
+					String invalid = "WARNING: There are potentially incompatible characters in the repository id.";
+					boolean proceedInvalid = !suggested.startsWith(repConfig.getID())
+							? consoleIO.askProceed(invalid, false) : true;
+					if (proceedInvalid && proceedOverwrite) {
 						try {
 							RepositoryConfigUtil.updateRepositoryConfigs(systemRepo, repConfig);
 							consoleIO.writeln("Repository created");

core/http/client/src/main/java/org/eclipse/rdf4j/http/client/RDF4JProtocolSession.java

@@ -19,6 +19,7 @@
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.regex.Matcher;
@@ -764,7 +765,11 @@ protected HttpUriRequest getQueryMethod(QueryLanguage ql, String query, String b
 			builder.setEntity(new UrlEncodedFormEntity(getQueryMethodParameters(ql, query, baseURI, dataset,
 					includeInferred, maxQueryTime, bindings), UTF8));
 		}
-
+		// functionality to provide custom http headers as required by the
+		// applications
+		for (Map.Entry<String, String> additionalHeader : getAdditionalHttpHeaders().entrySet()) {
+			builder.addHeader(additionalHeader.getKey(), additionalHeader.getValue());
+		}
 		return builder.build();
 	}
 
@@ -793,7 +798,11 @@ protected HttpUriRequest getUpdateMethod(QueryLanguage ql, String update, String
 			builder.setEntity(new UrlEncodedFormEntity(getUpdateMethodParameters(ql, update, baseURI, dataset,
 					includeInferred, maxExecutionTime, bindings), UTF8));
 		}
-
+		// functionality to provide custom http headers as required by the
+		// applications
+		for (Map.Entry<String, String> additionalHeader : getAdditionalHttpHeaders().entrySet()) {
+			builder.addHeader(additionalHeader.getKey(), additionalHeader.getValue());
+		}
 		return builder.build();
 	}
 

core/http/workbench/src/main/java/org/eclipse/rdf4j/workbench/proxy/CookieHandler.java

@@ -60,7 +60,7 @@ protected String getCookie(final HttpServletRequest req, final HttpServletRespon
 
 	private void initCookie(final Cookie cookie, final HttpServletRequest req) {
 		final String context = req.getContextPath();
-		cookie.setPath(null == context ? "/" : context);
+		cookie.setPath(context.isEmpty() ? "/" : context);
 		if (maxAge != null) {
 			cookie.setMaxAge(Integer.parseInt(maxAge));
 		}

core/http/workbench/src/main/java/org/eclipse/rdf4j/workbench/proxy/ServerValidator.java

@@ -118,6 +118,9 @@ private boolean canConnect(final String server) {
 				reader.close();
 			}
 		}
+		catch (NumberFormatException e) {
+			LOGGER.warn(e.toString(), e);
+		}
 		catch (MalformedURLException e) {
 			LOGGER.warn(e.toString(), e);
 		}

core/http/workbench/src/main/java/org/eclipse/rdf4j/workbench/util/CookieHandler.java

@@ -58,7 +58,7 @@ private void addCookie(final WorkbenchRequest req, final HttpServletResponse res
 		LOGGER.info("name: {}\nvalue: {}", name, value);
 		LOGGER.info("un-encoded value: {}\n--", raw);
 		final Cookie cookie = new Cookie(name, value);
-		if (null == req.getContextPath()) {
+		if (req.getContextPath().isEmpty()) {
 			cookie.setPath("/");
 		}
 		else {
@@ -96,7 +96,7 @@ public void addTotalResultCountCookie(WorkbenchRequest req, HttpServletResponse
 
 	public void addCookie(WorkbenchRequest req, HttpServletResponse resp, String name, String value) {
 		final Cookie cookie = new Cookie(name, value);
-		if (null == req.getContextPath()) {
+		if (req.getContextPath().isEmpty()) {
 			cookie.setPath("/");
 		}
 		else {