Browse Source

Grizzly-Jersey: Update deps, use HikariCP instead of c3p0 db pool

Keith R. Gustafson 9 years ago
parent
commit
026be6e901

+ 7 - 7
frameworks/Java/grizzly-jersey/pom.xml

@@ -14,13 +14,13 @@
   </prerequisites>
 
   <properties>
-    <grizzly.version>2.3.2</grizzly.version>
-    <jersey.version>1.17.1</jersey.version>
+    <grizzly.version>2.3.23</grizzly.version>
+    <jersey.version>1.19</jersey.version>
     <jersey-mustache.version>1.0.0</jersey-mustache.version>
-    <jackson.version>2.3.0</jackson.version>
-    <mustache.version>0.8.12</mustache.version>
-    <hibernate.version>4.2.1.Final</hibernate.version>
-    <mysql-connector.version>5.1.25</mysql-connector.version>
+    <jackson.version>2.7.0</jackson.version>
+    <mustache.version>0.9.1</mustache.version>
+    <hibernate.version>4.3.11.Final</hibernate.version>
+    <mysql-connector.version>5.1.38</mysql-connector.version>
   </properties>
 
   <dependencies>
@@ -49,7 +49,7 @@
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-c3p0</artifactId>
+      <artifactId>hibernate-hikaricp</artifactId>
       <version>${hibernate.version}</version>
     </dependency>
     <dependency>

+ 2 - 2
frameworks/Java/grizzly-jersey/src/main/java/hello/SessionFactoryProvider.java

@@ -24,9 +24,9 @@ public class SessionFactoryProvider extends SingletonTypeInjectableProvider<Cont
   
   private static SessionFactory createSessionFactory(final ResourceConfig rc) {
     Configuration configuration = new Configuration().configure();
-    String url = configuration.getProperty("hibernate.connection.url");
+    String url = configuration.getProperty("hibernate.hikari.dataSource.url");
     url = url.replace("//localhost:3306/", "//" + rc.getProperty("dbhost") + ":" + rc.getProperty("dbport") + "/");
-    configuration.setProperty("hibernate.connection.url", url);
+    configuration.setProperty("hibernate.hikari.dataSource.url", url);
     configuration.addAnnotatedClass(World.class);
     configuration.addAnnotatedClass(Fortune.class);
     ServiceRegistryBuilder serviceRegistryBuilder = new ServiceRegistryBuilder().applySettings(configuration.getProperties());

+ 9 - 9
frameworks/Java/grizzly-jersey/src/main/resources/hibernate.cfg.xml

@@ -1,16 +1,16 @@
 <!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
   <session-factory>
-    <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property>
-    <property name="hibernate.connection.url">jdbc:mysql://localhost:3306/hello_world?jdbcCompliantTruncation=false&amp;elideSetAutoCommits=true&amp;useLocalSessionState=true&amp;cachePrepStmts=true&amp;cacheCallableStmts=true&amp;alwaysSendSetIsolation=false&amp;prepStmtCacheSize=4096&amp;cacheServerConfiguration=true&amp;prepStmtCacheSqlLimit=2048&amp;zeroDateTimeBehavior=convertToNull&amp;traceProtocol=false&amp;useUnbufferedInput=false&amp;useReadAheadInput=false&amp;maintainTimeStats=false&amp;useServerPrepStmts&amp;cacheRSMetadata=true</property>
-    <property name="hibernate.connection.username">benchmarkdbuser</property>
-    <property name="hibernate.connection.password">benchmarkdbpass</property>
+    <property name="hibernate.connection.provider_class">org.hibernate.hikaricp.internal.HikariCPConnectionProvider</property>
     <property name="hibernate.dialect">org.hibernate.dialect.MySQLDialect</property>
     <property name="hibernate.cache.use_query_cache">false</property>
     <property name="hibernate.show_sql">false</property>
-    <property name="hibernate.c3p0.min_size">256</property>
-    <property name="hibernate.c3p0.max_size">256</property>
-    <property name="hibernate.c3p0.timeout">1800</property>
-    <property name="hibernate.c3p0.max_statements">2048</property>
+    <property name="hibernate.hikari.minimumIdle">256</property>
+    <property name="hibernate.hikari.maximumPoolSize">256</property>
+    <property name="hibernate.hikari.idleTimeout">30000</property>
+    <property name="hibernate.hikari.dataSourceClassName">com.mysql.jdbc.jdbc2.optional.MysqlDataSource</property>
+    <property name="hibernate.hikari.dataSource.url">jdbc:mysql://localhost:3306/hello_world?jdbcCompliantTruncation=false&amp;elideSetAutoCommits=true&amp;useLocalSessionState=true&amp;cachePrepStmts=true&amp;cacheCallableStmts=true&amp;alwaysSendSetIsolation=false&amp;prepStmtCacheSize=4096&amp;cacheServerConfiguration=true&amp;prepStmtCacheSqlLimit=2048&amp;zeroDateTimeBehavior=convertToNull&amp;traceProtocol=false&amp;useUnbufferedInput=false&amp;useReadAheadInput=false&amp;maintainTimeStats=false&amp;useServerPrepStmts&amp;cacheRSMetadata=true</property>
+    <property name="hibernate.hikari.dataSource.user">benchmarkdbuser</property>
+    <property name="hibernate.hikari.dataSource.password">benchmarkdbpass</property>
   </session-factory>
-</hibernate-configuration>
+</hibernate-configuration>