Removed .close() call from container-managed entity manager

gradle.properties

@@ -1,3 +1,3 @@
-jpacrepo.version=2023.07
+jpacrepo.version=2023.10.04
 
-lys.version=2023.07.28
+lys.version=2023.10.01

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +130,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

src/main/java/net/woggioni/jpacrepo/service/PacmanServiceEJB.java

@@ -96,7 +96,6 @@ public class PacmanServiceEJB implements PacmanServiceLocal {
     @TransactionAttribute(TransactionAttributeType.REQUIRED)
     @Schedule(hour = "4", minute = "00", persistent = false)
     public void syncDB() {
-        try {
         logger.info("Starting repository cleanup");
         //Removes from DB the packages that have been deleted from filesystem
         logger.info("Searching for packages that are no more in the filesystem");
@@ -122,7 +121,7 @@ public class PacmanServiceEJB implements PacmanServiceLocal {
             String name = file.getFileName().toString();
             return name.endsWith(".pkg.tar.xz") || name.endsWith(".pkg.tar.zst") || name.endsWith(".pkg.tar.gz");
         });
-            long[] count = new long[] {0};
+        long[] count = new long[]{0};
         long totalPackages = fileListStreamSupplier.get().count();
 
         Con<Boolean> persistPackages = (Boolean drain) -> {
@@ -161,9 +160,6 @@ public class PacmanServiceEJB implements PacmanServiceLocal {
         deleteOld(em);
         logger.info("Repository cleanup completed successfully");
         packageCache.invalidateCache();
-        } finally {
-            em.close();
-        }
     }
 
     private void persistPackage(EntityManager em, PkgData pkgData, long count, long totalPackages) {
@@ -194,6 +190,7 @@ public class PacmanServiceEJB implements PacmanServiceLocal {
         em.remove(pkg);
         Files.delete(ctx.getFile(pkg));
     }
+
     private void deleteOld(EntityManager em) {
         Instant cutoff = Instant.now().minus(365 * 3, ChronoUnit.DAYS);
         Queries.getOldPackages2Delete(em, cutoff, 3L)
@@ -281,7 +278,8 @@ public class PacmanServiceEJB implements PacmanServiceLocal {
             PkgId pkgId = tuple.get(0, PkgId.class);
             String filename = tuple.get(1, String.class);
             long size = tuple.get(2, Long.class);
-            String md5sum = tuple.get(3, String.class);;
+            String md5sum = tuple.get(3, String.class);
+            ;
             PkgTuple pkgTuple = new PkgTuple();
             pkgTuple.setFileName(filename);
             pkgTuple.setSize(size);
@@ -308,7 +306,7 @@ public class PacmanServiceEJB implements PacmanServiceLocal {
         List<PkgData> savedFiles = searchByFileName(fileName);
         if (savedFiles.size() > 0) return false;
         else {
-            try(OutputStream output = Files.newOutputStream(file)) {
+            try (OutputStream output = Files.newOutputStream(file)) {
                 JWO.copy(input, output, 0x10000);
                 PkgData pkg = PkgDataImpl.parseFile(file,
                         CompressionFormatImpl.guess(Paths.get(fileName)));