From 6b634681484f5d329ef190dcc9816c05c188fa83 Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Thu, 10 Nov 2022 15:10:49 +0100 Subject: [PATCH] RED-5293: fixed jdbcUrl-check by adding more checks; removed URL-check because it does not work --- .../service/TenantManagementService.java | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java index 552aa1dfa..70caaa3ff 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java @@ -1,8 +1,6 @@ package com.iqser.red.service.peristence.v1.server.service; -import java.net.MalformedURLException; import java.net.URI; -import java.net.URL; import java.sql.Connection; import java.sql.DriverManager; import java.util.List; @@ -133,22 +131,14 @@ public class TenantManagementService { @SneakyThrows private void validateJdbcUrl(String jdbcUrl) { - // just create a URI object to check if the string is a valid URI - new URI(jdbcUrl); -// // same as above but with a URL object - try { - String startExpr = "jdbc:postgresql://"; - if (!jdbcUrl.startsWith(startExpr)) { - throw new IllegalArgumentException("Your jdbcUrl is not URL conform."); - } - String afterStartExpr = jdbcUrl.substring(jdbcUrl.indexOf("//")).substring(2); - new URL(jdbcUrl.substring(jdbcUrl.indexOf(afterStartExpr))); - - } catch (MalformedURLException e) { - throw new IllegalArgumentException("Your jdbcUrl is not URL conform.", e); + String startExpr = "jdbc:postgresql://"; + if (!jdbcUrl.startsWith(startExpr)) { + throw new IllegalArgumentException("Your jdbcUrl is not URL conform."); } + // just create a URI object to check if the string is a valid URI + new URI(jdbcUrl); }