From e91153481a220235130a277d20f724b97fcfd325 Mon Sep 17 00:00:00 2001 From: drecchia Date: Mon, 30 May 2016 22:57:21 -0300 Subject: - Replaced connection poll from c3p0 to HikariCP. --- pom.xml | 8 ++-- src/org/traccar/database/DataManager.java | 62 +++++++++++++++++-------------- 2 files changed, 39 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 0b0d7c19b..dd8c5e5fa 100644 --- a/pom.xml +++ b/pom.xml @@ -48,10 +48,10 @@ 9.4.1208.jre7 - com.mchange - c3p0 - 0.9.5.2 - + com.zaxxer + HikariCP + 2.4.5 + io.netty netty diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index ac3be45ac..898669c21 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -15,7 +15,24 @@ */ package org.traccar.database; -import com.mchange.v2.c3p0.ComboPooledDataSource; +import java.io.File; +import java.lang.reflect.Method; +import java.net.URL; +import java.net.URLClassLoader; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +import javax.naming.InitialContext; +import javax.sql.DataSource; + import liquibase.Contexts; import liquibase.Liquibase; import liquibase.database.Database; @@ -23,6 +40,7 @@ import liquibase.database.DatabaseFactory; import liquibase.exception.LiquibaseException; import liquibase.resource.FileSystemResourceAccessor; import liquibase.resource.ResourceAccessor; + import org.traccar.Config; import org.traccar.Context; import org.traccar.helper.Log; @@ -34,22 +52,8 @@ import org.traccar.model.Position; import org.traccar.model.Server; import org.traccar.model.User; -import javax.naming.InitialContext; -import javax.sql.DataSource; -import java.io.File; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; public class DataManager implements IdentityManager { @@ -106,19 +110,23 @@ public class DataManager implements IdentityManager { Class.forName(driver); } - ComboPooledDataSource ds = new ComboPooledDataSource(); - ds.setDriverClass(config.getString("database.driver")); - ds.setJdbcUrl(config.getString("database.url")); - ds.setUser(config.getString("database.user")); - ds.setPassword(config.getString("database.password")); - ds.setIdleConnectionTestPeriod(600); - ds.setTestConnectionOnCheckin(true); - ds.setMaxStatementsPerConnection(config.getInteger("database.maxStatements")); + HikariConfig hConfig = new HikariConfig(); + hConfig.setDriverClassName( config.getString("database.driver") ); + hConfig.setJdbcUrl( config.getString("database.url") ); + hConfig.setUsername( config.getString("database.user") ); + hConfig.setPassword( config.getString("database.password") ); + hConfig.setConnectionInitSql( "SELECT 1 FROM DUAL" ); + hConfig.setIdleTimeout( 600000 ); // milliseconds +// ds.setIdleConnectionTestPeriod(600); +// ds.setMaxStatementsPerConnection(config.getInteger("database.maxStatements")); + int maxPoolSize = config.getInteger("database.maxPoolSize"); + if (maxPoolSize != 0) { - ds.setMaxPoolSize(maxPoolSize); + hConfig.setMaximumPoolSize( maxPoolSize ); } - dataSource = ds; + + dataSource = new HikariDataSource(hConfig); } } -- cgit v1.2.3 From 8ef478a317e9d3b58454699c053e5f9a1d53adf9 Mon Sep 17 00:00:00 2001 From: drecchia Date: Tue, 31 May 2016 08:54:29 -0300 Subject: - Fixed style issues. --- src/org/traccar/BaseProtocol.java | 3 ++- src/org/traccar/database/DataManager.java | 20 ++++++++++---------- src/org/traccar/helper/PatternUtil.java | 18 +++++++++++++++--- test/org/traccar/helper/PatternUtilTest.java | 2 +- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/org/traccar/BaseProtocol.java b/src/org/traccar/BaseProtocol.java index d1791d673..f968e81cc 100644 --- a/src/org/traccar/BaseProtocol.java +++ b/src/org/traccar/BaseProtocol.java @@ -61,7 +61,8 @@ public abstract class BaseProtocol implements Protocol { } } else { if (!supportedCommands.contains(command.getType())) { - throw new RuntimeException("Command " + command.getType() + " is not supported in protocol " + getName()); + throw new RuntimeException("Command " + + command.getType() + " is not supported in protocol " + getName()); } activeDevice.write(command); } diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 898669c21..cf2b03d56 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -111,21 +111,21 @@ public class DataManager implements IdentityManager { } HikariConfig hConfig = new HikariConfig(); - hConfig.setDriverClassName( config.getString("database.driver") ); - hConfig.setJdbcUrl( config.getString("database.url") ); - hConfig.setUsername( config.getString("database.user") ); - hConfig.setPassword( config.getString("database.password") ); - hConfig.setConnectionInitSql( "SELECT 1 FROM DUAL" ); - hConfig.setIdleTimeout( 600000 ); // milliseconds + hConfig.setDriverClassName(config.getString("database.driver")); + hConfig.setJdbcUrl(config.getString("database.url")); + hConfig.setUsername(config.getString("database.user")); + hConfig.setPassword(config.getString("database.password")); + hConfig.setConnectionInitSql("SELECT 1 FROM DUAL"); + hConfig.setIdleTimeout(600000); // milliseconds // ds.setIdleConnectionTestPeriod(600); // ds.setMaxStatementsPerConnection(config.getInteger("database.maxStatements")); - + int maxPoolSize = config.getInteger("database.maxPoolSize"); - + if (maxPoolSize != 0) { - hConfig.setMaximumPoolSize( maxPoolSize ); + hConfig.setMaximumPoolSize(maxPoolSize); } - + dataSource = new HikariDataSource(hConfig); } diff --git a/src/org/traccar/helper/PatternUtil.java b/src/org/traccar/helper/PatternUtil.java index 3d61cc698..88c3f053b 100644 --- a/src/org/traccar/helper/PatternUtil.java +++ b/src/org/traccar/helper/PatternUtil.java @@ -25,9 +25,21 @@ public final class PatternUtil { } public static class MatchResult { - public String pattern; - public String matched; - public String remaining; + private String pattern; + private String matched; + private String remaining; + + public String getPattern() { + return this.pattern; + } + + public String getMatched() { + return this.matched; + } + + public String getRemaining() { + return this.remaining; + } } public static MatchResult checkPattern(String pattern, String input) { diff --git a/test/org/traccar/helper/PatternUtilTest.java b/test/org/traccar/helper/PatternUtilTest.java index 9d8ed9bbd..bb1349363 100644 --- a/test/org/traccar/helper/PatternUtilTest.java +++ b/test/org/traccar/helper/PatternUtilTest.java @@ -9,7 +9,7 @@ public class PatternUtilTest { @Test public void testCheckPattern() { - assertEquals("ab", PatternUtil.checkPattern("abc", "abd").pattern); + assertEquals("ab", PatternUtil.checkPattern("abc", "abd").getPattern()); } -- cgit v1.2.3 From 7c63436636a5e08a6e25db4e3f7f51a688bd0b72 Mon Sep 17 00:00:00 2001 From: drecchia Date: Tue, 31 May 2016 08:55:08 -0300 Subject: - CheckStyle-cs config. --- .checkstyle | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .checkstyle diff --git a/.checkstyle b/.checkstyle new file mode 100644 index 000000000..96f43bf8f --- /dev/null +++ b/.checkstyle @@ -0,0 +1,10 @@ + + + + + + + + + + -- cgit v1.2.3 From 1c0ccc88eb1482297d4bfaebd7d72505f55625cd Mon Sep 17 00:00:00 2001 From: drecchia Date: Tue, 31 May 2016 08:58:38 -0300 Subject: - Fixed style. --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index dd8c5e5fa..eb1ac20de 100644 --- a/pom.xml +++ b/pom.xml @@ -48,10 +48,10 @@ 9.4.1208.jre7 - com.zaxxer - HikariCP - 2.4.5 - + com.zaxxer + HikariCP + 2.4.5 + io.netty netty -- cgit v1.2.3 From 5df7c128af15e9d1021b7570f081185f14467f09 Mon Sep 17 00:00:00 2001 From: drecchia Date: Wed, 1 Jun 2016 09:56:30 -0300 Subject: - Minor changes as requested in pull request. --- src/org/traccar/database/DataManager.java | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index cf2b03d56..19560db5c 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -110,23 +110,21 @@ public class DataManager implements IdentityManager { Class.forName(driver); } - HikariConfig hConfig = new HikariConfig(); - hConfig.setDriverClassName(config.getString("database.driver")); - hConfig.setJdbcUrl(config.getString("database.url")); - hConfig.setUsername(config.getString("database.user")); - hConfig.setPassword(config.getString("database.password")); - hConfig.setConnectionInitSql("SELECT 1 FROM DUAL"); - hConfig.setIdleTimeout(600000); // milliseconds -// ds.setIdleConnectionTestPeriod(600); -// ds.setMaxStatementsPerConnection(config.getInteger("database.maxStatements")); + HikariConfig hikariConfig = new HikariConfig(); + hikariConfig.setDriverClassName(config.getString("database.driver")); + hikariConfig.setJdbcUrl(config.getString("database.url")); + hikariConfig.setUsername(config.getString("database.user")); + hikariConfig.setPassword(config.getString("database.password")); + hikariConfig.setConnectionInitSql("SELECT 1 FROM DUAL"); + hikariConfig.setIdleTimeout(600000); int maxPoolSize = config.getInteger("database.maxPoolSize"); if (maxPoolSize != 0) { - hConfig.setMaximumPoolSize(maxPoolSize); + hikariConfig.setMaximumPoolSize(maxPoolSize); } - dataSource = new HikariDataSource(hConfig); + dataSource = new HikariDataSource(hikariConfig); } } -- cgit v1.2.3 From 086ba0cd100a94b5b6f4b45849a1b990ed30b3c2 Mon Sep 17 00:00:00 2001 From: drecchia Date: Wed, 1 Jun 2016 21:15:30 -0300 Subject: - Removed checkstyle-cs configuration. --- .checkstyle | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .checkstyle diff --git a/.checkstyle b/.checkstyle deleted file mode 100644 index 96f43bf8f..000000000 --- a/.checkstyle +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - -- cgit v1.2.3 From 27770369091fd063503ccea4cca6a815a03ca79f Mon Sep 17 00:00:00 2001 From: drecchia Date: Wed, 1 Jun 2016 21:46:48 -0300 Subject: - Fixed code style. --- src/org/traccar/database/DataManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 839cf8cad..ad7c4478b 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -123,7 +123,7 @@ public class DataManager implements IdentityManager { int maxPoolSize = config.getInteger("database.maxPoolSize"); if (maxPoolSize != 0) { - hikariConfig.setMaximumPoolSize(maxPoolSize); + hikariConfig.setMaximumPoolSize(maxPoolSize); } dataSource = new HikariDataSource(hikariConfig); -- cgit v1.2.3