Adapt to ProjectCache interface change
Change-Id: I97306745212c5dedf8fba4f7f510db29c302d970
diff --git a/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java b/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java
index 7223a49..cb46c94 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java
@@ -14,6 +14,8 @@
package com.googlesource.gerrit.plugins.simplesubmitrules.config;
+import static com.google.gerrit.server.project.ProjectCache.illegalState;
+
import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
@@ -28,6 +30,7 @@
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectConfig;
import com.google.gerrit.server.project.ProjectResource;
+import com.google.gerrit.server.project.ProjectState;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
@@ -88,6 +91,8 @@
projectCache.evict(projectName);
}
- return Response.ok(configTranslator.convertFrom(projectCache.checkedGet(projectName)));
+ ProjectState projectState =
+ projectCache.get(projectName).orElseThrow(illegalState(projectName));
+ return Response.ok(configTranslator.convertFrom(projectState));
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigTranslator.java b/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigTranslator.java
index 9904b13..bea7df0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigTranslator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigTranslator.java
@@ -14,6 +14,8 @@
package com.googlesource.gerrit.plugins.simplesubmitrules.config;
+import static com.google.gerrit.server.project.ProjectCache.illegalState;
+
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -142,7 +144,10 @@
// The current project does not have this label. Try to copy it down from the inherited
// labels to be able to modify it locally.
Map<String, LabelType> copiedLabelTypes = projectConfig.getLabelSections();
- ProjectState projectState = projectCache.checkedGet(projectConfig.getName());
+ ProjectState projectState =
+ projectCache
+ .get(projectConfig.getName())
+ .orElseThrow(illegalState(projectConfig.getName()));
projectState.getLabelTypes().getLabelTypes().stream()
.filter(l -> l.getName().equals(entry.getKey()))
.filter(l -> l.canOverride())
