HikariCP

mbuechner · May 3, 2022 · 62ad324 · 62ad324
1 parent f85e82b
commit 62ad324
Show file tree

Hide file tree

Showing 17 changed files with 164 additions and 131 deletions.
diff --git a/docs/dependencies.html b/docs/dependencies.html
diff --git a/docs/dependency-info.html b/docs/dependency-info.html
@@ -78,7 +78,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia the 2022-05-02
+ Generated by Apache Maven Doxia the 2022-05-03
  Rendered using Docs Maven Skin 2.0.8 (https://github.com/Bernardo-MG/docs-maven-skin)
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
@@ -133,7 +133,7 @@
            <span class="navbar-toggler-icon"></span>
         </button>
 
-        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5</span> (<time id="navbar-date">2022-05-02</time>)</small>
+        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5.2</span> (<time id="navbar-date">2022-05-03</time>)</small>
         <div class="col-sm d-none d-md-block">
             <a href="https://github.com/mbuechner/beagen" title="Github" aria-label="Github"><span class="navbar-icon fa fa-github pl-1" aria-hidden="true"></span> <span class="d-none d-sm-block d-md-none"> Github</span></a>
         </div>
@@ -172,36 +172,36 @@ <h3 id="Apache-Maven">Apache Maven</h3>
   <pre class="border shadow rounded"><code>&lt;dependency&gt;
   &lt;groupId&gt;de.ddb.labs&lt;/groupId&gt;
   &lt;artifactId&gt;beagen&lt;/artifactId&gt;
-  &lt;version&gt;1.5&lt;/version&gt;
+  &lt;version&gt;1.5.2&lt;/version&gt;
 &lt;/dependency&gt;</code></pre>
  </section>
  <section> 
   <h3 id="Apache-Buildr">Apache Buildr</h3> 
-  <pre class="border shadow rounded"><code>'de.ddb.labs:beagen:jar:1.5'</code></pre>
+  <pre class="border shadow rounded"><code>'de.ddb.labs:beagen:jar:1.5.2'</code></pre>
  </section>
  <section> 
   <h3 id="Apache-Ivy">Apache Ivy</h3> 
-  <pre class="border shadow rounded"><code>&lt;dependency org="de.ddb.labs" name="beagen" rev="1.5"&gt;
+  <pre class="border shadow rounded"><code>&lt;dependency org="de.ddb.labs" name="beagen" rev="1.5.2"&gt;
   &lt;artifact name="beagen" type="jar" /&gt;
 &lt;/dependency&gt;</code></pre>
  </section>
  <section> 
   <h3 id="Groovy-Grape">Groovy Grape</h3> 
   <pre class="border shadow rounded"><code>@Grapes(
-@Grab(group='de.ddb.labs', module='beagen', version='1.5')
+@Grab(group='de.ddb.labs', module='beagen', version='1.5.2')
 )</code></pre>
  </section>
  <section> 
   <h3 id="GradleGrails">Gradle/Grails</h3> 
-  <pre class="border shadow rounded"><code>compile 'de.ddb.labs:beagen:1.5'</code></pre>
+  <pre class="border shadow rounded"><code>compile 'de.ddb.labs:beagen:1.5.2'</code></pre>
  </section>
  <section> 
   <h3 id="Scala-SBT">Scala SBT</h3> 
-  <pre class="border shadow rounded"><code>libraryDependencies += "de.ddb.labs" % "beagen" % "1.5"</code></pre>
+  <pre class="border shadow rounded"><code>libraryDependencies += "de.ddb.labs" % "beagen" % "1.5.2"</code></pre>
  </section>
  <section> 
   <h3 id="Leiningen">Leiningen</h3> 
-  <pre class="border shadow rounded"><code>[de.ddb.labs/beagen "1.5"]</code></pre>
+  <pre class="border shadow rounded"><code>[de.ddb.labs/beagen "1.5.2"]</code></pre>
  </section>
 </section>
 </section>

diff --git a/docs/index.html b/docs/index.html
@@ -78,7 +78,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia the 2022-05-02
+ Generated by Apache Maven Doxia the 2022-05-03
  Rendered using Docs Maven Skin 2.0.8 (https://github.com/Bernardo-MG/docs-maven-skin)
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
@@ -133,7 +133,7 @@
            <span class="navbar-toggler-icon"></span>
         </button>
 
-        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5</span> (<time id="navbar-date">2022-05-02</time>)</small>
+        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5.2</span> (<time id="navbar-date">2022-05-03</time>)</small>
         <div class="col-sm d-none d-md-block">
             <a href="https://github.com/mbuechner/beagen" title="Github" aria-label="Github"><span class="navbar-icon fa fa-github pl-1" aria-hidden="true"></span> <span class="d-none d-sm-block d-md-none"> Github</span></a>
         </div>

diff --git a/docs/issue-management.html b/docs/issue-management.html
@@ -78,7 +78,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia the 2022-05-02
+ Generated by Apache Maven Doxia the 2022-05-03
  Rendered using Docs Maven Skin 2.0.8 (https://github.com/Bernardo-MG/docs-maven-skin)
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
@@ -133,7 +133,7 @@
            <span class="navbar-toggler-icon"></span>
         </button>
 
-        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5</span> (<time id="navbar-date">2022-05-02</time>)</small>
+        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5.2</span> (<time id="navbar-date">2022-05-03</time>)</small>
         <div class="col-sm d-none d-md-block">
             <a href="https://github.com/mbuechner/beagen" title="Github" aria-label="Github"><span class="navbar-icon fa fa-github pl-1" aria-hidden="true"></span> <span class="d-none d-sm-block d-md-none"> Github</span></a>
         </div>

diff --git a/docs/licenses.html b/docs/licenses.html
@@ -78,7 +78,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia the 2022-05-02
+ Generated by Apache Maven Doxia the 2022-05-03
  Rendered using Docs Maven Skin 2.0.8 (https://github.com/Bernardo-MG/docs-maven-skin)
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
@@ -133,7 +133,7 @@
            <span class="navbar-toggler-icon"></span>
         </button>
 
-        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5</span> (<time id="navbar-date">2022-05-02</time>)</small>
+        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5.2</span> (<time id="navbar-date">2022-05-03</time>)</small>
         <div class="col-sm d-none d-md-block">
             <a href="https://github.com/mbuechner/beagen" title="Github" aria-label="Github"><span class="navbar-icon fa fa-github pl-1" aria-hidden="true"></span> <span class="d-none d-sm-block d-md-none"> Github</span></a>
         </div>

diff --git a/docs/plugin-management.html b/docs/plugin-management.html
@@ -78,7 +78,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia the 2022-05-02
+ Generated by Apache Maven Doxia the 2022-05-03
  Rendered using Docs Maven Skin 2.0.8 (https://github.com/Bernardo-MG/docs-maven-skin)
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
@@ -133,7 +133,7 @@
            <span class="navbar-toggler-icon"></span>
         </button>
 
-        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5</span> (<time id="navbar-date">2022-05-02</time>)</small>
+        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5.2</span> (<time id="navbar-date">2022-05-03</time>)</small>
         <div class="col-sm d-none d-md-block">
             <a href="https://github.com/mbuechner/beagen" title="Github" aria-label="Github"><span class="navbar-icon fa fa-github pl-1" aria-hidden="true"></span> <span class="d-none d-sm-block d-md-none"> Github</span></a>
         </div>

diff --git a/docs/plugins.html b/docs/plugins.html
@@ -78,7 +78,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia the 2022-05-02
+ Generated by Apache Maven Doxia the 2022-05-03
  Rendered using Docs Maven Skin 2.0.8 (https://github.com/Bernardo-MG/docs-maven-skin)
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
@@ -133,7 +133,7 @@
            <span class="navbar-toggler-icon"></span>
         </button>
 
-        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5</span> (<time id="navbar-date">2022-05-02</time>)</small>
+        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5.2</span> (<time id="navbar-date">2022-05-03</time>)</small>
         <div class="col-sm d-none d-md-block">
             <a href="https://github.com/mbuechner/beagen" title="Github" aria-label="Github"><span class="navbar-icon fa fa-github pl-1" aria-hidden="true"></span> <span class="d-none d-sm-block d-md-none"> Github</span></a>
         </div>

diff --git a/docs/project-info.html b/docs/project-info.html
@@ -78,7 +78,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia the 2022-05-02
+ Generated by Apache Maven Doxia the 2022-05-03
  Rendered using Docs Maven Skin 2.0.8 (https://github.com/Bernardo-MG/docs-maven-skin)
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
@@ -133,7 +133,7 @@
            <span class="navbar-toggler-icon"></span>
         </button>
 
-        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5</span> (<time id="navbar-date">2022-05-02</time>)</small>
+        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5.2</span> (<time id="navbar-date">2022-05-03</time>)</small>
         <div class="col-sm d-none d-md-block">
             <a href="https://github.com/mbuechner/beagen" title="Github" aria-label="Github"><span class="navbar-icon fa fa-github pl-1" aria-hidden="true"></span> <span class="d-none d-sm-block d-md-none"> Github</span></a>
         </div>

diff --git a/docs/scm.html b/docs/scm.html
@@ -78,7 +78,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia the 2022-05-02
+ Generated by Apache Maven Doxia the 2022-05-03
  Rendered using Docs Maven Skin 2.0.8 (https://github.com/Bernardo-MG/docs-maven-skin)
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
@@ -133,7 +133,7 @@
            <span class="navbar-toggler-icon"></span>
         </button>
 
-        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5</span> (<time id="navbar-date">2022-05-02</time>)</small>
+        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5.2</span> (<time id="navbar-date">2022-05-03</time>)</small>
         <div class="col-sm d-none d-md-block">
             <a href="https://github.com/mbuechner/beagen" title="Github" aria-label="Github"><span class="navbar-icon fa fa-github pl-1" aria-hidden="true"></span> <span class="d-none d-sm-block d-md-none"> Github</span></a>
         </div>

diff --git a/docs/summary.html b/docs/summary.html
@@ -78,7 +78,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia the 2022-05-02
+ Generated by Apache Maven Doxia the 2022-05-03
  Rendered using Docs Maven Skin 2.0.8 (https://github.com/Bernardo-MG/docs-maven-skin)
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
@@ -133,7 +133,7 @@
            <span class="navbar-toggler-icon"></span>
         </button>
 
-        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5</span> (<time id="navbar-date">2022-05-02</time>)</small>
+        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5.2</span> (<time id="navbar-date">2022-05-03</time>)</small>
         <div class="col-sm d-none d-md-block">
             <a href="https://github.com/mbuechner/beagen" title="Github" aria-label="Github"><span class="navbar-icon fa fa-github pl-1" aria-hidden="true"></span> <span class="d-none d-sm-block d-md-none"> Github</span></a>
         </div>
@@ -235,7 +235,7 @@ <h2 id="Build-Information">Build Information</h2>
     </tr> 
     <tr> 
      <td align="left">Version</td> 
-     <td>1.5</td>
+     <td>1.5.2</td>
     </tr> 
     <tr> 
      <td align="left">Type</td> 

diff --git a/docs/team.html b/docs/team.html
@@ -78,7 +78,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia the 2022-05-02
+ Generated by Apache Maven Doxia the 2022-05-03
  Rendered using Docs Maven Skin 2.0.8 (https://github.com/Bernardo-MG/docs-maven-skin)
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
@@ -133,7 +133,7 @@
            <span class="navbar-toggler-icon"></span>
         </button>
 
-        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5</span> (<time id="navbar-date">2022-05-02</time>)</small>
+        <small class="navbar-text d-none d-md-block"><span id="navbar-version">1.5.2</span> (<time id="navbar-date">2022-05-03</time>)</small>
         <div class="col-sm d-none d-md-block">
             <a href="https://github.com/mbuechner/beagen" title="Github" aria-label="Github"><span class="navbar-icon fa fa-github pl-1" aria-hidden="true"></span> <span class="d-none d-sm-block d-md-none"> Github</span></a>
         </div>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.ddb.labs</groupId>
     <artifactId>beagen</artifactId>
-    <version>1.5</version>
+    <version>1.5.2</version>
     <packaging>jar</packaging>
     <name>Beagen</name>
     <description>Ein BEACON-Datei-Generator für die Deutsche Digitale Bibliothek.</description>
@@ -89,22 +89,21 @@
             <version>2.3.2</version>
             <type>jar</type>
         </dependency>
-        <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.2.Final</version>
-            <type>jar</type>
-        </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
             <version>5.6.8.Final</version>
-        </dependency>            
+        </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-c3p0</artifactId>
             <version>5.6.8.Final</version>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-hikaricp</artifactId>
+            <version>5.6.8.Final</version>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -115,7 +114,6 @@
             <artifactId>okhttp</artifactId>
             <version>4.9.3</version>
         </dependency>
-
     </dependencies>
     <reporting>
         <plugins>

diff --git a/src/main/java/de/ddb/labs/beagen/Main.java b/src/main/java/de/ddb/labs/beagen/Main.java
@@ -96,7 +96,7 @@ public static void main(String[] args) throws Exception {
                 .withSchedule(CronScheduleBuilder.cronSchedule(Configuration.get().getValue(BEAGEN_CRON)))
                 .build();
 
-        quartzScheduler = new StdSchedulerFactory().getDefaultScheduler();
+        quartzScheduler = StdSchedulerFactory.getDefaultScheduler();
         quartzScheduler.start();
         quartzScheduler.scheduleJob(job, trigger);
 

diff --git a/src/main/java/de/ddb/labs/beagen/backend/BeaconFileController.java b/src/main/java/de/ddb/labs/beagen/backend/BeaconFileController.java
@@ -64,6 +64,7 @@ public static BeaconFile getBeaconFile(long id) {
             return null;
         } finally {
             tx.commit();
+            em.close();
         }
     }
 
@@ -97,7 +98,7 @@ public static List<BeaconFile> getBeaconFiles(TYPE type, boolean onlyLatest) {
         }
 
         final EntityManager em = EntityManagerUtil.getInstance().getEntityManager();
-        final EntityTransaction tx = EntityManagerUtil.getInstance().getEntityTransaction();
+        final EntityTransaction tx = em.getTransaction();
         tx.begin();
         try {
             final Query q2 = em.createQuery(qs, BeaconFile.class);
@@ -117,6 +118,7 @@ public static List<BeaconFile> getBeaconFiles(TYPE type, boolean onlyLatest) {
             return new ArrayList<>();
         } finally {
             tx.commit();
+            em.close();
         }
     }
 
@@ -158,6 +160,7 @@ public static List<BeaconFile> getBeaconFiles(TYPE type, SECTOR sector, boolean
             return new ArrayList<>();
         } finally {
             tx.commit();
+            em.close();
         }
 
     }
@@ -194,6 +197,7 @@ public static Date getLastDate(TYPE type) {
             return null;
         } finally {
             tx.commit();
+            em.close();
         }
     }
 }
diff --git a/src/main/java/de/ddb/labs/beagen/backend/helper/EntityManagerUtil.java b/src/main/java/de/ddb/labs/beagen/backend/helper/EntityManagerUtil.java
@@ -28,11 +28,9 @@ public class EntityManagerUtil {
 
     private static EntityManagerUtil instance;
     private final EntityManagerFactory EMF;
-    private final EntityManager EM;
 
     private EntityManagerUtil() {
         EMF = Persistence.createEntityManagerFactory("BeagenFile");
-        EM = EMF.createEntityManager();
     }
 
     public static synchronized EntityManagerUtil getInstance() {
@@ -43,17 +41,10 @@ public static synchronized EntityManagerUtil getInstance() {
     }
 
     public EntityManager getEntityManager() {
-        return EM;
-    }
-
-    public EntityTransaction getEntityTransaction() {
-        return getInstance().getEntityManager().getTransaction();
+        return EMF.createEntityManager();
     }
 
     public void shutdown() {
-        if (EM != null) {
-            EM.close();
-        }
         if (EMF != null) {
             EMF.close();
         }

diff --git a/src/main/java/de/ddb/labs/beagen/backend/jobs/BeaconJob.java b/src/main/java/de/ddb/labs/beagen/backend/jobs/BeaconJob.java
@@ -148,6 +148,7 @@ public void executeNewspapers(Date date) {
             tx.begin();
             em.persist(bf);
             tx.commit();
+            em.close();
         } else {
             LOG.warn("Beacon file {}/{} generated is equal to last beacon file in database, so it was NOT written to database.", TYPE.NEWSPAPER, SECTOR.ALL);
         }
@@ -255,6 +256,7 @@ public void execute(TYPE type, SECTOR[] sectors, Date date) {
                         tx.begin();
                         em.persist(files_sector);
                         tx.commit();
+                        em.close();
                     } else {
                         LOG.warn("Beacon file {}/{} generated is equal to last beacon file in database, so it was NOT written to database.", type, sector);
                     }