From 9763044457ae1e20dfc2c03f7f6632a8de82e940 Mon Sep 17 00:00:00 2001
From: Edwin Kempin <ekempin@google.com>
Date: Wed, 11 Mar 2020 10:57:35 +0100
Subject: [PATCH] ProjectCache: Remove declarations of unthrown IOException

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I9037aa7a3ceef0f6777a572da934cea320555301
---
 java/com/google/gerrit/acceptance/ProjectResetter.java |  2 +-
 .../gerrit/server/git/receive/ReceiveCommits.java      |  7 +------
 .../com/google/gerrit/server/project/ProjectCache.java | 10 ++++------
 .../google/gerrit/server/project/ProjectCacheImpl.java |  8 ++++----
 plugins/delete-project                                 |  2 +-
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/java/com/google/gerrit/acceptance/ProjectResetter.java b/java/com/google/gerrit/acceptance/ProjectResetter.java
index 8d38381d3f..a528974478 100644
--- a/java/com/google/gerrit/acceptance/ProjectResetter.java
+++ b/java/com/google/gerrit/acceptance/ProjectResetter.java
@@ -298,7 +298,7 @@ public class ProjectResetter implements AutoCloseable {
   }
 
   /** Evict projects for which the config was changed. */
-  private void evictAndReindexProjects() throws IOException {
+  private void evictAndReindexProjects() {
     if (projectCache == null) {
       return;
     }
diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
index 263d06c85a..2a549303db 100644
--- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
+++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
@@ -3097,12 +3097,7 @@ class ReceiveCommits {
       }
       if (isConfig(cmd)) {
         logger.atFine().log("Reloading project in cache");
-        try {
-          projectCache.evict(project);
-        } catch (IOException e) {
-          logger.atWarning().withCause(e).log(
-              "Cannot evict from project cache, name key: %s", project.getName());
-        }
+        projectCache.evict(project);
         ProjectState ps =
             projectCache.get(project.getNameKey()).orElseThrow(illegalState(project.getNameKey()));
         try {
diff --git a/java/com/google/gerrit/server/project/ProjectCache.java b/java/com/google/gerrit/server/project/ProjectCache.java
index 82a54b4562..3fba7d3c7c 100644
--- a/java/com/google/gerrit/server/project/ProjectCache.java
+++ b/java/com/google/gerrit/server/project/ProjectCache.java
@@ -62,29 +62,27 @@ public interface ProjectCache {
    * Invalidate the cached information about the given project, and triggers reindexing for it
    *
    * @param p project that is being evicted
-   * @throws IOException thrown if the reindexing fails
    */
-  void evict(Project p) throws IOException;
+  void evict(Project p);
 
   /**
    * Invalidate the cached information about the given project, and triggers reindexing for it
    *
    * @param p the NameKey of the project that is being evicted
-   * @throws IOException thrown if the reindexing fails
    */
-  void evict(Project.NameKey p) throws IOException;
+  void evict(Project.NameKey p);
 
   /**
    * Remove information about the given project from the cache. It will no longer be returned from
    * {@link #all()}.
    */
-  void remove(Project p) throws IOException;
+  void remove(Project p);
 
   /**
    * Remove information about the given project from the cache. It will no longer be returned from
    * {@link #all()}.
    */
-  void remove(Project.NameKey name) throws IOException;
+  void remove(Project.NameKey name);
 
   /** @return sorted iteration of projects. */
   ImmutableSortedSet<Project.NameKey> all();
diff --git a/java/com/google/gerrit/server/project/ProjectCacheImpl.java b/java/com/google/gerrit/server/project/ProjectCacheImpl.java
index 460b8f5339..102da7116c 100644
--- a/java/com/google/gerrit/server/project/ProjectCacheImpl.java
+++ b/java/com/google/gerrit/server/project/ProjectCacheImpl.java
@@ -158,12 +158,12 @@ public class ProjectCacheImpl implements ProjectCache {
   }
 
   @Override
-  public void evict(Project p) throws IOException {
+  public void evict(Project p) {
     evict(p.getNameKey());
   }
 
   @Override
-  public void evict(Project.NameKey p) throws IOException {
+  public void evict(Project.NameKey p) {
     if (p != null) {
       logger.atFine().log("Evict project '%s'", p.get());
       byName.invalidate(p.get());
@@ -172,12 +172,12 @@ public class ProjectCacheImpl implements ProjectCache {
   }
 
   @Override
-  public void remove(Project p) throws IOException {
+  public void remove(Project p) {
     remove(p.getNameKey());
   }
 
   @Override
-  public void remove(Project.NameKey name) throws IOException {
+  public void remove(Project.NameKey name) {
     listLock.lock();
     try {
       list.put(
diff --git a/plugins/delete-project b/plugins/delete-project
index 4126b52235..c06a7e4d9b 160000
--- a/plugins/delete-project
+++ b/plugins/delete-project
@@ -1 +1 @@
-Subproject commit 4126b5223546999133836d588e1775fd672c72e5
+Subproject commit c06a7e4d9b63dddbc3575317d0b989ef69c81fe0