Skip to content

The Unified and Autonomous Development Platform

Migration to Wicket Url object

Andrea Del Bene85573c122a77
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.java
index 684f6d1e6a..1adacd76d7 100644
--- a/server-core/src/main/java/io/onedev/server/OneDev.java
+++ b/server-core/src/main/java/io/onedev/server/OneDev.java
@@ -8,6 +8,8 @@ import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.UnknownHostException;
+import java.nio.charset.Charset;
+import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutorService;
@@ -18,6 +20,7 @@ import javax.inject.Inject;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemUtils;
+import org.apache.wicket.request.Url;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -138,8 +141,8 @@ public class OneDev extends AbstractPlugin implements Serializable {
initStage = null;
}
- public String guessServerUrl() {
- String serverUrl = null;
+ public Url guessServerUrl() {
+ Url serverUrl = null;
String serviceHost = System.getenv("ONEDEV_SERVICE_HOST");
if (serviceHost != null) { // we are running inside Kubernetes
@@ -224,29 +227,31 @@ public class OneDev extends AbstractPlugin implements Serializable {
}
if (serverConfig.getHttpsPort() != 0)
- serverUrl = "https://" + host + ":" + serverConfig.getHttpsPort();
- else
- serverUrl = "http://" + host + ":" + serverConfig.getHttpPort();
+ serverUrl = new Url(Arrays.asList("https", host, Integer.toString(serverConfig.getHttpsPort())), Charset.forName("UTF8"));
+ else
+ serverUrl = new Url(Arrays.asList("http", host, Integer.toString(serverConfig.getHttpPort())), Charset.forName("UTF8"));
+
}
return serverUrl;
}
- private String buildServerUrl(String host, @Nullable String httpPort, @Nullable String httpsPort) {
- String serverUrl = null;
+ private Url buildServerUrl(String host, @Nullable String httpPort, @Nullable String httpsPort) {
+ Url serverUrl = null;
if (httpsPort != null) {
- serverUrl = "https://" + host;
- if (!httpsPort.equals("443"))
- serverUrl += ":" + httpsPort;
+ serverUrl = new Url(Arrays.asList("https", host), Charset.forName("UTF8"));
+ if (!httpsPort.equals("443"))
+ serverUrl.setPort(Integer.parseInt(httpsPort));
} else if (httpPort != null) {
- serverUrl = "http://" + host;
+ serverUrl = new Url(Arrays.asList("http", host), Charset.forName("UTF8"));
if (!httpPort.equals("80"))
- serverUrl += ":" + httpPort;
+ serverUrl.setPort(Integer.parseInt(httpPort));
} else {
logger.warn("This OneDev deployment looks odd to me: "
+ "both http and https port are not specified");
}
return serverUrl;
+
}
/**
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
index 57e27ea758..ba9a7c6e52 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
@@ -138,7 +138,7 @@ public class DefaultDataManager implements DataManager, Serializable {
if (setting == null || setting.getValue() == null) {
systemSetting = new SystemSetting();
- systemSetting.setServerUrl(OneDev.getInstance().guessServerUrl());
+ systemSetting.setServerUrl(OneDev.getInstance().guessServerUrl().toString());
} else if (!validator.validate(setting.getValue()).isEmpty()) {
systemSetting = (SystemSetting) setting.getValue();
}