openvidu-server: beautify some empty lines

openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java

@@ -242,15 +242,12 @@ public class OpenViduServer implements JsonRpcConfigurer {
 			String msg = "\n\n\n" + "   Configuration errors\n" + "   --------------------\n" + "\n";
 
 			for (Error error : config.getConfigErrors()) {
-
 				msg += "   * Property " + config.getPropertyName(error.getProperty());
-
 				if (error.getValue() == null || error.getValue().equals("")) {
 					msg += " is not set. ";
 				} else {
 					msg += "=" + error.getValue() + ". ";
 				}
-
 				msg += error.getMessage() + "\n";
 			}
 

openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java

@@ -161,7 +161,6 @@ public class OpenviduConfig {
 
 	protected int openviduSessionsGarbageThreshold;
 
-	
 	// Derived properties
 
 	public static String finalUrl;
@@ -386,8 +385,8 @@ public class OpenviduConfig {
 	}
 
 	protected List<String> getNonUserProperties() {
-		return Arrays.asList("coturn.ip", "coturn.redis.ip", "kms.uris", "server.port",
+		return Arrays.asList("coturn.ip", "coturn.redis.ip", "kms.uris", "server.port", "coturn.redis.dbname",
-				"coturn.redis.dbname", "coturn.redis.password", "coturn.redis.connect-timeout");
+				"coturn.redis.password", "coturn.redis.connect-timeout");
 	}
 
 	// Properties
@@ -440,9 +439,7 @@ public class OpenviduConfig {
 	}
 
 	private void checkCertificateType() {
-		
 		String property = "certificate.type";
-		
 		certificateType = asNonEmptyString(property);
 
 		if (certificateType != null && !certificateType.isEmpty()) {
@@ -454,11 +451,9 @@ public class OpenviduConfig {
 	}
 
 	private void checkCoturnIp() {
-
 		coturnIp = getConfigValue("coturn.ip");
 
 		if (coturnIp == null || this.coturnIp.isEmpty()) {
-
 			try {
 				this.coturnIp = new URL(this.getFinalUrl()).getHost();
 			} catch (MalformedURLException e) {
@@ -467,9 +462,7 @@ public class OpenviduConfig {
 		}
 	}
 
-	
 	private void checkWebhook() {
-
 		openviduWebhookEnabled = asBoolean("openvidu.webhook");
 		openviduWebhookEndpoint = asOptionalURL("openvidu.webhook.endpoint");
 		webhookHeadersList = checkWebhookHeaders();
@@ -493,27 +486,17 @@ public class OpenviduConfig {
 	}
 
 	private void checkOpenviduPublicurl() {
-
 		final String property = "openvidu.domain.or.public.ip";
-
 		String domain = getConfigValue(property);
 
 		if (domain != null && !domain.isEmpty()) {
-
 			this.openviduPublicUrl = "https://" + domain;
-
 		} else {
-
 			final String urlProperty = "openvidu.publicurl";
-
 			String publicurl = getConfigValue(urlProperty);
-
 			if (publicurl == null || publicurl.isEmpty()) {
-
 				addError(property, "Cannot be empty");
-
 			} else {
-
 				if (!OPENVIDU_VALID_PUBLICURL_VALUES.contains(publicurl)) {
 					try {
 						checkUrl(publicurl);
@@ -521,7 +504,6 @@ public class OpenviduConfig {
 						addError(property, "Is not a valid URL. " + e.getMessage());
 					}
 				}
-
 				this.openviduPublicUrl = publicurl;
 			}
 		}
@@ -532,7 +514,6 @@ public class OpenviduConfig {
 	}
 
 	private void calculatePublicUrl() {
-
 		String publicUrl = this.getOpenViduPublicUrl();
 
 		String type = "";
@@ -564,7 +545,6 @@ public class OpenviduConfig {
 			type = "local";
 			OpenViduServer.wsUrl = "wss://localhost:" + this.getServerPort();
 		}
-
 		if (OpenViduServer.wsUrl.endsWith("/")) {
 			OpenViduServer.wsUrl = OpenViduServer.wsUrl.substring(0, OpenViduServer.wsUrl.length() - 1);
 		}
@@ -575,13 +555,9 @@ public class OpenviduConfig {
 		OpenViduServer.publicurlType = type;
 	}
 
-
 	public List<String> checkKmsUris() {
-
 		String property = "kms.uris";
-
 		String kmsUris = getConfigValue(property);
-
 		if (kmsUris == null || kmsUris.isEmpty()) {
 			return Arrays.asList();
 		}
@@ -594,7 +570,6 @@ public class OpenviduConfig {
 		kmsUris = kmsUris.replaceAll(",", "\\\",\\\""); // Escape middle uris
 
 		List<String> kmsUrisArray = asJsonStringsArray(property);
-
 		for (String uri : kmsUrisArray) {
 			try {
 				this.checkWebsocketUri(uri);
@@ -607,15 +582,11 @@ public class OpenviduConfig {
 	}
 
 	private List<Header> checkWebhookHeaders() {
-
 		String property = "openvidu.webhook.headers";
-
 		List<String> headers = asJsonStringsArray(property);
-
 		List<Header> headerList = new ArrayList<>();
 
 		for (String header : headers) {
-
 			String[] headerSplit = header.split(": ", 2);
 			if (headerSplit.length != 2) {
 				addError(property, "HTTP header '" + header
@@ -636,11 +607,8 @@ public class OpenviduConfig {
 	}
 
 	private List<CDREventName> getWebhookEvents() {
-
 		String property = "openvidu.webhook.events";
-
 		List<String> events = asJsonStringsArray(property);
-
 		List<CDREventName> eventList = new ArrayList<>();
 
 		for (String event : events) {
@@ -658,7 +626,6 @@ public class OpenviduConfig {
 	// -------------------------------------------------------
 
 	protected String asOptionalURL(String property) {
-
 		String optionalUrl = getConfigValue(property);
 		try {
 			if (!optionalUrl.isEmpty()) {
@@ -672,9 +639,7 @@ public class OpenviduConfig {
 	}
 
 	protected String asNonEmptyString(String property) {
-
 		String stringValue = getConfigValue(property);
-
 		if (stringValue != null && !stringValue.isEmpty()) {
 			return stringValue;
 		} else {
@@ -688,9 +653,7 @@ public class OpenviduConfig {
 	}
 
 	protected boolean asBoolean(String property) {
-
 		String value = getConfigValue(property);
-
 		if (value == null) {
 			addError(property, "Cannot be empty");
 			return false;
@@ -719,7 +682,7 @@ public class OpenviduConfig {
 	}
 
 	/*
-	 * This method checks all types of internet addresses (IPv4, IPv6 and Domains)
+	 * This method checks all types of Internet addresses (IPv4, IPv6 and Domains)
 	 */
 	protected String asOptionalInetAddress(String property) {
 		String inetAddress = getConfigValue(property);
@@ -748,9 +711,7 @@ public class OpenviduConfig {
 	}
 
 	protected List<String> asJsonStringsArray(String property) {
-
 		try {
-
 			Gson gson = new Gson();
 			JsonArray jsonArray = gson.fromJson(getConfigValue(property), JsonArray.class);
 			List<String> list = JsonUtils.toStringList(jsonArray);
@@ -758,7 +719,6 @@ public class OpenviduConfig {
 				list = new ArrayList<>();
 			}
 			return list;
-
 		} catch (JsonSyntaxException e) {
 			addError(property, "Is not a valid strings array in JSON format. " + e.getMessage());
 			return Arrays.asList();
@@ -766,7 +726,6 @@ public class OpenviduConfig {
 	}
 
 	protected <E extends Enum<E>> E asEnumValue(String property, Class<E> enumType) {
-		
 		String value = this.getConfigValue(property);
 		try {
 			return Enum.valueOf(enumType, value);