opendev/gerrit
Code Issues Proposed changes

Rely on GroupAuditService rather than its implementation

Browse Source 
GroupAuditService is the interface to the underlying audit
system, while AuditService is the actual implementation.

Instead of directly injecting the implementation class, rely on
the interface and leave the association to AuditService to the
Guice binding.

This is useful because tests may want to replace, at times, the
actual implementation of the audit-trail with a fake in-memory
store.

Change-Id: I31bbb522fb974c2504635ccf1251287d4890af89
This commit is contained in:
Luca Milanesio
2019-02-04 17:58:41 +00:00
parent 4adddf6442
commit 6a130c17a2
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/com/google/gerrit/sshd/SshLog.java
View File

@@ -21,7 +21,6 @@ import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.PeerDaemonUser;
import com.google.gerrit.server.audit.AuditService;
import com.google.gerrit.server.audit.SshAuditEvent;
import com.google.gerrit.server.config.ConfigKey;
import com.google.gerrit.server.config.ConfigUpdatedEvent;
@@ -29,6 +28,7 @@ import com.google.gerrit.server.config.ConfigUpdatedEvent.ConfigUpdateEntry;
import com.google.gerrit.server.config.ConfigUpdatedEvent.UpdateResult;
import com.google.gerrit.server.config.GerritConfigListener;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.group.GroupAuditService;
import com.google.gerrit.server.ioutil.HexFormat;
import com.google.gerrit.server.util.SystemLog;
import com.google.gerrit.server.util.time.TimeUtil;
@@ -57,7 +57,7 @@ class SshLog implements LifecycleListener, GerritConfigListener {
private final Provider<SshSession> session;
private final Provider<Context> context;
private volatile AsyncAppender async;
private final AuditService auditService;
private final GroupAuditService auditService;
private final SystemLog systemLog;
private final Object lock = new Object();
@@ -68,7 +68,7 @@ class SshLog implements LifecycleListener, GerritConfigListener {
final Provider<Context> context,
SystemLog systemLog,
@GerritServerConfig Config config,
AuditService auditService) {
GroupAuditService auditService) {
this.session = session;
this.context = context;
this.auditService = auditService;