diff artifacts/src/main/java/org/dive4elements/river/utils/MapUtils.java @ 9671:9cfc495a9f40 3.2.x

Add minimal test coverage for MapServer connection generation
author Tom Gottfried <tom@intevation.de>
date Fri, 22 May 2020 19:45:08 +0200
parents 07d854c325d8
children b70b1bc0eece
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/utils/MapUtils.java	Wed May 20 17:50:27 2020 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/utils/MapUtils.java	Fri May 22 19:45:08 2020 +0200
@@ -38,6 +38,10 @@
         String pass = SessionFactoryProvider.getPass(sf);
         String url  = SessionFactoryProvider.getURL(sf);
 
+        return getConnection(user, pass, url);
+    }
+
+    public static String getConnection(String user, String pass, String url) {
         log.debug("Parse connection url: " + url);
 
         Matcher m = DB_URL_PATTERN.matcher(url);
@@ -65,7 +69,7 @@
         String port = m.group(3);
         String db   = m.group(4);
 
-        if (RiverUtils.isUsingOracle()) {
+        if (url.startsWith("jdbc:oracle:")) {
             connection = user + "/" + pass
                 + "@" + host + ":" + port + "/" + db;
         }

http://dive4elements.wald.intevation.org