[jackrabbit-filevault] branch master updated: trivial: use Java 8 UncheckedIOException instead of custom one

[kw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git


The following commit(s) were added to refs/heads/master by this push:
     new 6d83619  trivial: use Java 8 UncheckedIOException instead of custom one
     new 441d771  Merge branch 'master' of git@github.com:apache/jackrabbit-filevault.git
6d83619 is described below

commit 6d83619cbffe80744590d91610bfece4ad1a525a
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Jun 7 08:04:59 2021 +0200

    trivial: use Java 8 UncheckedIOException instead of custom one
---
 .../packaging/registry/impl/FSInstallStateCache.java | 20 ++------------------
 .../packaging/registry/impl/FSPackageRegistry.java   |  5 +++--
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallStateCache.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallStateCache.java
index fb019d2..a68de14 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallStateCache.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSInstallStateCache.java
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.vault.packaging.registry.impl;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.AbstractMap;
@@ -33,28 +34,11 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Persisted cache of all {@link FSInstallState} objects for all packages in a registry.
  * Populated on demand and written back immediately for every modifying operation.
+ * All map operations might throw {@link java.io.UncheckedIOException}.
  * Is thread-safe.
  */
 class FSInstallStateCache extends AbstractMap<PackageId, FSInstallState> {
 
-    /** Wraps a checked IOExceptioin in a unchecked exception, this is potentially thrown from all Map operations */
-    final class UncheckedIOException extends RuntimeException {
-        /**
-         * 
-         */
-        private static final long serialVersionUID = 1188317232809121358L;
-        private final IOException ioException;
-
-        public UncheckedIOException(IOException ioException) {
-            super(ioException.getMessage(), ioException);
-            this.ioException = ioException;
-        }
-
-        public IOException getIOException() {
-            return ioException;
-        }
-    }
-
     /**
      * Extension for metadata files
      */
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java
index b2c793d..aba2cb0 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSPackageRegistry.java
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.vault.packaging.registry.impl;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -234,8 +235,8 @@ public class FSPackageRegistry extends AbstractPackageRegistry {
     FSInstallState getInstallState(@NotNull PackageId id) throws IOException {
         try {
             return stateCache.get(id);
-        } catch (FSInstallStateCache.UncheckedIOException e) {
-            throw e.getIOException();
+        } catch (UncheckedIOException e) {
+            throw e.getCause();
         }
     }