Merge branch 'stable-3.2'

* stable-3.2:
  Fix JSON audit user reporting and testing
  Fix JSON rendering of HTTP response audit

Change-Id: I2b49b653a8234f1e8e46d96f21a3f3bcd6f5466d
diff --git a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditUser.java b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditUser.java
index 2e6dd8a..0bb3280 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditUser.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditUser.java
@@ -27,11 +27,6 @@
   }
 
   @Override
-  public Object getCacheKey() {
-    return null;
-  }
-
-  @Override
   public Optional<String> getUserName() {
     return Optional.of(username);
   }