#JENKINS-21058 - Reuse SessionFactory and load hibernate properties u…

…sing hibernate prefix.

src/main/java/org/jenkins/plugins/audit2db/internal/data/HibernateUtil.java

@@ -26,6 +26,8 @@
 public class HibernateUtil {
     private final static Logger LOGGER = Logger.getLogger(HibernateUtil.class.getName());
 
+    private static SessionFactory factory = null;
+
     private static Configuration getConfig(final Properties extraProperties) throws HibernateException {
         LOGGER.log(Level.INFO, Messages.HibernateUtil_LoadConfig());
         final Configuration config = new AnnotationConfiguration().configure();
@@ -38,19 +40,20 @@ private static Configuration getConfig(final Properties extraProperties) throws
     }
 
     public static SessionFactory getSessionFactory(final Properties extraProperties) {
-        SessionFactory retval = null;
-
-        try {
-            // Load base configuration from hibernate.cfg.xml
-            final Configuration config = getConfig(extraProperties);
-            retval = config.buildSessionFactory();
-        } catch (final Exception e) {
-            // Make sure you log the exception, as it might be swallowed
-            LOGGER.log(Level.SEVERE, Messages.HibernateUtil_FailedSessionFactory(), e);
-            throw new RuntimeException(e);
+
+        if (factory == null){
+            try {
+                // Load base configuration from hibernate.cfg.xml
+                final Configuration config = getConfig(extraProperties);
+                factory = config.buildSessionFactory();
+            } catch (final Exception e) {
+                // Make sure you log the exception, as it might be swallowed
+                LOGGER.log(Level.SEVERE, Messages.HibernateUtil_FailedSessionFactory(), e);
+                throw new RuntimeException(e);
+            }
         }
+        return factory;
 
-        return retval;
     }
 
     public static SessionFactory getSessionFactory() {
@@ -86,7 +89,7 @@ public static String getSchemaDdl(
 
         final Configuration config = getConfig(props);
         final SchemaExport generator = new SchemaExport(config);
-        final File tempDdlFile = File.createTempFile("jenkins_audit2db", ".ddl");
+        final File tempDdlFile = new File("jenkins_audit2db.ddl");
         generator.setOutputFile(tempDdlFile.getPath());
         generator.setFormat(true);
         generator.execute(true, false, false, true);

src/main/resources/hibernate.cfg.xml

@@ -4,13 +4,13 @@
     "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory>
-        <property name="c3p0.max_size">10</property>
-        <property name="c3p0.min_size">2</property>
-        <property name="c3p0.timeout">1800</property>
-        <property name="c3p0.max_statements">50</property>
-        <property name="connection.autocommit">true</property>
-        <property name="current_session_context_class">thread</property>
-        <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property>
+        <property name="hibernate.c3p0.max_size">10</property>
+        <property name="hibernate.c3p0.min_size">2</property>
+        <property name="hibernate.c3p0.timeout">1800</property>
+        <property name="hibernate.c3p0.max_statements">50</property>
+        <property name="hibernate.connection.autocommit">true</property>
+        <property name="hibernate.current_session_context_class">thread</property>
+        <property name="hibernate.cache.provider_class">org.hibernate.cache.NoCacheProvider</property>
         <property name="show_sql">false</property>
 
         <mapping