[accumulo] branch main updated: Fix minor issues for #3206 (#3224)

[cshannon]

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

cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new 628c282f7b Fix minor issues for #3206 (#3224)
628c282f7b is described below

commit 628c282f7b3a0e70ae789f590036baebc35c1084
Author: Christopher L. Shannon <christopher.l.shan...@gmail.com>
AuthorDate: Fri Mar 3 11:23:45 2023 -0500

    Fix minor issues for #3206 (#3224)
    
    * Narrow catch block for exception handling to only UncheckedIOException
    * Fix google cache regex in checkstyle rules
---
 .../org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java | 2 +-
 pom.xml                                                                 | 2 +-
 .../main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
 
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
index f106ba8e6b..0643ba1d80 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
@@ -176,7 +176,7 @@ public class CachableBlockFile {
             throw new UncheckedIOException(e);
           }
         });
-      } catch (Exception e) {
+      } catch (UncheckedIOException e) {
         throw new IOException("Failed to get " + cacheId + " len from cache ", 
e);
       }
     }
diff --git a/pom.xml b/pom.xml
index 05eba6b3c4..a23c0bf0c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1130,7 +1130,7 @@
                   <property name="message" value="Unnecessary concatenation of 
string literals" />
                 </module>
                 <module name="RegexpSinglelineJava">
-                  <property name="format" value="com.google.common.cache[.]" />
+                  <property name="format" 
value="com[.]google[.]common[.]cache[.]" />
                   <property name="message" value="Please use Caffeine Cache, 
not Guava" />
                 </module>
                 <module name="OuterTypeFilename" />
diff --git 
a/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
 
b/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
index cb0fd76dc2..7bceb71e9c 100644
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
@@ -151,7 +151,7 @@ public class RecoveryManager {
           throw new UncheckedIOException(e);
         }
       });
-    } catch (Exception e) {
+    } catch (UncheckedIOException e) {
       throw new IOException(e);
     }
   }