Rename GsonParser to CacheKeyJsonParser
The GsonParser, unlike its name suggests, is not used as a general
purpose json parser but only for parsing json representation of cache
keys. Rename it to reflect its purpose.
This rename also makes it easier to distinguish between the usages of
the two Gson instances: @EventGson Gson and CacheKeyJsonParser.
Change-Id: Iadf8df9f008428f9827ac16c70130333c20d4a51
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParser.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheKeyJsonParser.java
similarity index 96%
rename from src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParser.java
rename to src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheKeyJsonParser.java
index 3b1c4b9..01c7dbc 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParser.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheKeyJsonParser.java
@@ -27,11 +27,11 @@
import com.google.inject.Singleton;
@Singleton
-class GsonParser {
+class CacheKeyJsonParser {
private final Gson gson;
@Inject
- public GsonParser(@EventGson Gson gson) {
+ public CacheKeyJsonParser(@EventGson Gson gson) {
this.gson = gson;
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServlet.java
index 60e782f..86d64d2 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServlet.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServlet.java
@@ -34,13 +34,14 @@
private static final long serialVersionUID = -1L;
private final ForwardedCacheEvictionHandler forwardedCacheEvictionHandler;
- private final GsonParser gson;
+ private final CacheKeyJsonParser cacheKeyParser;
@Inject
CacheRestApiServlet(
- ForwardedCacheEvictionHandler forwardedCacheEvictionHandler, GsonParser gson) {
+ ForwardedCacheEvictionHandler forwardedCacheEvictionHandler,
+ CacheKeyJsonParser cacheKeyParser) {
this.forwardedCacheEvictionHandler = forwardedCacheEvictionHandler;
- this.gson = gson;
+ this.cacheKeyParser = cacheKeyParser;
}
@Override
@@ -51,7 +52,7 @@
String cacheName = params.get(CACHENAME_INDEX);
String json = req.getReader().readLine();
forwardedCacheEvictionHandler.evict(
- CacheEntry.from(cacheName, gson.fromJson(cacheName, json)));
+ CacheEntry.from(cacheName, cacheKeyParser.fromJson(cacheName, json)));
rsp.setStatus(SC_NO_CONTENT);
} catch (CacheNotFoundException e) {
log.atSevere().log("Failed to process eviction request: %s", e.getMessage());
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParserTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheKeyJsonParserTest.java
similarity index 95%
rename from src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParserTest.java
rename to src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheKeyJsonParserTest.java
index b3b1271..3df4e67 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/GsonParserTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheKeyJsonParserTest.java
@@ -24,10 +24,10 @@
import com.google.gson.Gson;
import org.junit.Test;
-public class GsonParserTest {
+public class CacheKeyJsonParserTest {
private static final Object EMPTY_JSON = "{}";
private final Gson gson = new EventGsonProvider().get();
- private final GsonParser objectUnderTest = new GsonParser(gson);
+ private final CacheKeyJsonParser objectUnderTest = new CacheKeyJsonParser(gson);
@Test
public void accountIDParse() {
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServletTest.java
index 44dd7f0..e4ffd59 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServletTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/CacheRestApiServletTest.java
@@ -46,7 +46,8 @@
@Before
public void setUp() {
servlet =
- new CacheRestApiServlet(forwardedCacheEvictionHandlerMock, new GsonParser(new Gson()));
+ new CacheRestApiServlet(
+ forwardedCacheEvictionHandlerMock, new CacheKeyJsonParser(new Gson()));
}
@Test
