1 files changed, 47 insertions, 61 deletions

diff --git a/src/main/java/org/traccar/database/DataManager.java b/src/main/java/org/traccar/database/DataManager.java
index ac4749a15..bd1c77520 100644
--- a/src/main/java/org/traccar/database/DataManager.java
+++ b/src/main/java/org/traccar/database/DataManager.java
@@ -15,20 +15,8 @@
  */
 package org.traccar.database;
 
-import java.beans.Introspector;
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
 import liquibase.Contexts;
 import liquibase.Liquibase;
 import liquibase.database.Database;
@@ -36,14 +24,16 @@ import liquibase.database.DatabaseFactory;
 import liquibase.exception.LiquibaseException;
 import liquibase.resource.FileSystemResourceAccessor;
 import liquibase.resource.ResourceAccessor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.traccar.config.Config;
 import org.traccar.Context;
+import org.traccar.config.Config;
 import org.traccar.config.Keys;
 import org.traccar.helper.DateUtil;
 import org.traccar.model.Attribute;
+import org.traccar.model.BaseModel;
+import org.traccar.model.Calendar;
+import org.traccar.model.Command;
 import org.traccar.model.Device;
 import org.traccar.model.Driver;
 import org.traccar.model.Event;
@@ -53,16 +43,22 @@ import org.traccar.model.Maintenance;
 import org.traccar.model.ManagedUser;
 import org.traccar.model.Notification;
 import org.traccar.model.Permission;
-import org.traccar.model.BaseModel;
-import org.traccar.model.Calendar;
-import org.traccar.model.Command;
 import org.traccar.model.Position;
 import org.traccar.model.Server;
 import org.traccar.model.Statistics;
 import org.traccar.model.User;
 
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
+import javax.sql.DataSource;
+import java.beans.Introspector;
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 public class DataManager {
 
@@ -93,53 +89,43 @@ public class DataManager {
 
     private void initDatabase() throws Exception {
 
-        String jndiName = config.getString("database.jndi");
-
-        if (jndiName != null) {
-
-            dataSource = (DataSource) new InitialContext().lookup(jndiName);
-
-        } else {
-
-            String driverFile = config.getString(Keys.DATABASE_DRIVER_FILE);
-            if (driverFile != null) {
-                ClassLoader classLoader = ClassLoader.getSystemClassLoader();
-                try {
-                    Method method = classLoader.getClass().getDeclaredMethod("addURL", URL.class);
-                    method.setAccessible(true);
-                    method.invoke(classLoader, new File(driverFile).toURI().toURL());
-                } catch (NoSuchMethodException e) {
-                    Method method = classLoader.getClass()
-                            .getDeclaredMethod("appendToClassPathForInstrumentation", String.class);
-                    method.setAccessible(true);
-                    method.invoke(classLoader, driverFile);
-                }
-            }
-
-            String driver = config.getString(Keys.DATABASE_DRIVER);
-            if (driver != null) {
-                Class.forName(driver);
+        String driverFile = config.getString(Keys.DATABASE_DRIVER_FILE);
+        if (driverFile != null) {
+            ClassLoader classLoader = ClassLoader.getSystemClassLoader();
+            try {
+                Method method = classLoader.getClass().getDeclaredMethod("addURL", URL.class);
+                method.setAccessible(true);
+                method.invoke(classLoader, new File(driverFile).toURI().toURL());
+            } catch (NoSuchMethodException e) {
+                Method method = classLoader.getClass()
+                        .getDeclaredMethod("appendToClassPathForInstrumentation", String.class);
+                method.setAccessible(true);
+                method.invoke(classLoader, driverFile);
             }
+        }
 
-            HikariConfig hikariConfig = new HikariConfig();
-            hikariConfig.setDriverClassName(driver);
-            hikariConfig.setJdbcUrl(config.getString(Keys.DATABASE_URL));
-            hikariConfig.setUsername(config.getString(Keys.DATABASE_USER));
-            hikariConfig.setPassword(config.getString(Keys.DATABASE_PASSWORD));
-            hikariConfig.setConnectionInitSql(config.getString(Keys.DATABASE_CHECK_CONNECTION, "SELECT 1"));
-            hikariConfig.setIdleTimeout(600000);
+        String driver = config.getString(Keys.DATABASE_DRIVER);
+        if (driver != null) {
+            Class.forName(driver);
+        }
 
-            int maxPoolSize = config.getInteger("database.maxPoolSize");
+        HikariConfig hikariConfig = new HikariConfig();
+        hikariConfig.setDriverClassName(driver);
+        hikariConfig.setJdbcUrl(config.getString(Keys.DATABASE_URL));
+        hikariConfig.setUsername(config.getString(Keys.DATABASE_USER));
+        hikariConfig.setPassword(config.getString(Keys.DATABASE_PASSWORD));
+        hikariConfig.setConnectionInitSql(config.getString(Keys.DATABASE_CHECK_CONNECTION, "SELECT 1"));
+        hikariConfig.setIdleTimeout(600000);
 
-            if (maxPoolSize != 0) {
-                hikariConfig.setMaximumPoolSize(maxPoolSize);
-            }
+        int maxPoolSize = config.getInteger("database.maxPoolSize");
 
-            generateQueries = config.getBoolean("database.generateQueries");
+        if (maxPoolSize != 0) {
+            hikariConfig.setMaximumPoolSize(maxPoolSize);
+        }
 
-            dataSource = new HikariDataSource(hikariConfig);
+        generateQueries = config.getBoolean("database.generateQueries");
 
-        }
+        dataSource = new HikariDataSource(hikariConfig);
     }
 
     public static String constructObjectQuery(String action, Class<?> clazz, boolean extended) {