From 4f5f815f88e81000510ef2544e3e392fd7465d8e Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 9 Oct 2014 13:24:47 +1300 Subject: Integrate c3p0 database library --- src/org/traccar/model/DataManager.java | 37 ----- src/org/traccar/model/DatabaseDataManager.java | 202 ------------------------- 2 files changed, 239 deletions(-) delete mode 100644 src/org/traccar/model/DataManager.java delete mode 100644 src/org/traccar/model/DatabaseDataManager.java (limited to 'src/org/traccar/model') diff --git a/src/org/traccar/model/DataManager.java b/src/org/traccar/model/DataManager.java deleted file mode 100644 index f0bfdb50d..000000000 --- a/src/org/traccar/model/DataManager.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2012 Anton Tananaev (anton.tananaev@gmail.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.model; - -import java.util.List; - -/** - * Data manager - */ -public interface DataManager { - - /** - * Manage devices - */ - public List getDevices() throws Exception; - public Device getDeviceByImei(String imei) throws Exception; - - /** - * Manage positions - */ - public Long addPosition(Position position) throws Exception; - public void updateLatestPosition(Position position, Long positionId) throws Exception; - -} diff --git a/src/org/traccar/model/DatabaseDataManager.java b/src/org/traccar/model/DatabaseDataManager.java deleted file mode 100644 index f8d8806a7..000000000 --- a/src/org/traccar/model/DatabaseDataManager.java +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Copyright 2012 - 2014 Anton Tananaev (anton.tananaev@gmail.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.model; - -import java.io.File; -import java.io.StringReader; -import java.net.URL; -import java.net.URLClassLoader; -import java.sql.*; -import java.util.*; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; -import org.traccar.helper.AdvancedConnection; -import org.traccar.helper.DriverDelegate; -import org.traccar.helper.Log; -import org.traccar.helper.NamedParameterStatement; -import org.xml.sax.InputSource; - -/** - * Database abstraction class - */ -public class DatabaseDataManager implements DataManager { - - public DatabaseDataManager(Properties properties) throws Exception { - initDatabase(properties); - } - - /** - * Database statements - */ - private NamedParameterStatement queryGetDevices; - private NamedParameterStatement queryAddPosition; - private NamedParameterStatement queryUpdateLatestPosition; - - /** - * Initialize database - */ - private void initDatabase(Properties properties) throws Exception { - - // Load driver - String driver = properties.getProperty("database.driver"); - if (driver != null) { - String driverFile = properties.getProperty("database.driverFile"); - - if (driverFile != null) { - URL url = new URL("jar:file:" + new File(driverFile).getAbsolutePath() + "!/"); - URLClassLoader cl = new URLClassLoader(new URL[]{url}); - Driver d = (Driver) Class.forName(driver, true, cl).newInstance(); - DriverManager.registerDriver(new DriverDelegate(d)); - } else { - Class.forName(driver); - } - } - - // Connect database - String url = properties.getProperty("database.url"); - String user = properties.getProperty("database.user"); - String password = properties.getProperty("database.password"); - AdvancedConnection connection = new AdvancedConnection(url, user, password); - - // Load statements from configuration - String query; - - query = properties.getProperty("database.selectDevice"); - if (query != null) { - queryGetDevices = new NamedParameterStatement(connection, query); - } - - query = properties.getProperty("database.insertPosition"); - if (query != null) { - queryAddPosition = new NamedParameterStatement(connection, query); - } - - query = properties.getProperty("database.updateLatestPosition"); - if (query != null) { - queryUpdateLatestPosition = new NamedParameterStatement(connection, query); - } - } - - @Override - public synchronized List getDevices() throws SQLException { - - List deviceList = new LinkedList(); - - if (queryGetDevices != null) { - queryGetDevices.prepare(); - ResultSet result = queryGetDevices.executeQuery(); - while (result.next()) { - Device device = new Device(); - device.setId(result.getLong("id")); - device.setImei(result.getString("imei")); - deviceList.add(device); - } - } - - return deviceList; - } - - /** - * Devices cache - */ - private Map devices; - - @Override - public Device getDeviceByImei(String imei) throws SQLException { - - if (devices == null || !devices.containsKey(imei)) { - devices = new HashMap(); - for (Device device : getDevices()) { - devices.put(device.getImei(), device); - } - } - - return devices.get(imei); - } - - @Override - public synchronized Long addPosition(Position position) throws SQLException { - - if (queryAddPosition != null) { - queryAddPosition.prepare(Statement.RETURN_GENERATED_KEYS); - - queryAddPosition = assignVariables(queryAddPosition, position); - - queryAddPosition.executeUpdate(); - - ResultSet result = queryAddPosition.getGeneratedKeys(); - if (result != null && result.next()) { - return result.getLong(1); - } - } - - return null; - } - - @Override - public void updateLatestPosition(Position position, Long positionId) throws SQLException { - if (queryUpdateLatestPosition != null) { - queryUpdateLatestPosition.prepare(); - - queryUpdateLatestPosition = assignVariables(queryUpdateLatestPosition, position); - queryUpdateLatestPosition.setLong("id", positionId); - - queryUpdateLatestPosition.executeUpdate(); - } - } - - private NamedParameterStatement assignVariables(NamedParameterStatement preparedStatement, Position position) throws SQLException { - - preparedStatement.setLong("device_id", position.getDeviceId()); - preparedStatement.setTimestamp("time", position.getTime()); - preparedStatement.setBoolean("valid", position.getValid()); - preparedStatement.setDouble("altitude", position.getAltitude()); - preparedStatement.setDouble("latitude", position.getLatitude()); - preparedStatement.setDouble("longitude", position.getLongitude()); - preparedStatement.setDouble("speed", position.getSpeed()); - preparedStatement.setDouble("course", position.getCourse()); - preparedStatement.setString("address", position.getAddress()); - preparedStatement.setString("extended_info", position.getExtendedInfo()); - - // DELME: Temporary compatibility support - XPath xpath = XPathFactory.newInstance().newXPath(); - try { - InputSource source = new InputSource(new StringReader(position.getExtendedInfo())); - String index = xpath.evaluate("/info/index", source); - if (!index.isEmpty()) { - preparedStatement.setLong("id", Long.valueOf(index)); - } else { - preparedStatement.setLong("id", null); - } - source = new InputSource(new StringReader(position.getExtendedInfo())); - String power = xpath.evaluate("/info/power", source); - if (!power.isEmpty()) { - preparedStatement.setDouble("power", Double.valueOf(power)); - } else { - preparedStatement.setLong("power", null); - } - } catch (XPathExpressionException e) { - Log.warning("Error in XML: " + position.getExtendedInfo(), e); - preparedStatement.setLong("id", null); - preparedStatement.setLong("power", null); - } - - return preparedStatement; - - } - -} -- cgit v1.2.3