Merge branch 'stable-2.15'

* stable-2.15:
  Reformat all code with Google Java Format
  Eclipse warning: simplify else block

Change-Id: Iecce9bb9dd3a2a9e49e210f2309c3d9072637f88

src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditEventFormat.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditEventFormat.java b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditEventFormat.java
index cb07193..8c172b6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditEventFormat.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditEventFormat.java
@@ -14,8 +14,8 @@
 
 package com.googlesource.gerrit.plugins.auditsl4j;
 
-import com.google.gerrit.audit.AuditEvent;
-import com.google.gerrit.audit.SshAuditEvent;
+import com.google.gerrit.server.audit.AuditEvent;
+import com.google.gerrit.server.audit.SshAuditEvent;
 
 public class AuditEventFormat implements AuditFormatter<SshAuditEvent> {
   public static final Class<?> CLASS = AuditEvent.class;

src/main/java/com/googlesource/gerrit/plugins/auditsl4j/HttpAuditEventFormat.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/HttpAuditEventFormat.java b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/HttpAuditEventFormat.java
index 6551725..43b884a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/HttpAuditEventFormat.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/HttpAuditEventFormat.java
@@ -14,7 +14,7 @@
 
 package com.googlesource.gerrit.plugins.auditsl4j;
 
-import com.google.gerrit.audit.HttpAuditEvent;
+import com.google.gerrit.server.audit.HttpAuditEvent;
 
 public class HttpAuditEventFormat implements AuditFormatter<HttpAuditEvent> {
   protected static final Class<?> CLASS = HttpAuditEvent.class;

src/main/java/com/googlesource/gerrit/plugins/auditsl4j/LoggerAudit.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/LoggerAudit.java b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/LoggerAudit.java
index 1a0d3c9..7ce623b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/LoggerAudit.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/LoggerAudit.java
@@ -15,9 +15,9 @@
 package com.googlesource.gerrit.plugins.auditsl4j;
 
 import com.google.common.collect.Multimap;
-import com.google.gerrit.audit.AuditEvent;
-import com.google.gerrit.audit.AuditListener;
 import com.google.gerrit.extensions.annotations.Listen;
+import com.google.gerrit.server.audit.AuditEvent;
+import com.google.gerrit.server.audit.AuditListener;
 import com.google.inject.Singleton;
 import java.text.SimpleDateFormat;
 import java.util.Collection;

src/main/java/com/googlesource/gerrit/plugins/auditsl4j/RpcAuditEventFormat.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/RpcAuditEventFormat.java b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/RpcAuditEventFormat.java
index 5aa47bf..a910cf4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/RpcAuditEventFormat.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/RpcAuditEventFormat.java
@@ -14,8 +14,8 @@
 
 package com.googlesource.gerrit.plugins.auditsl4j;
 
-import com.google.gerrit.audit.HttpAuditEvent;
-import com.google.gerrit.audit.RpcAuditEvent;
+import com.google.gerrit.server.audit.HttpAuditEvent;
+import com.google.gerrit.server.audit.RpcAuditEvent;
 
 public class RpcAuditEventFormat implements AuditFormatter<HttpAuditEvent> {
   protected static final Class<?> CLASS = RpcAuditEvent.class;

src/main/java/com/googlesource/gerrit/plugins/auditsl4j/SshAuditEventFormat.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/SshAuditEventFormat.java b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/SshAuditEventFormat.java
index 9a15f77..1ded66b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/SshAuditEventFormat.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/SshAuditEventFormat.java
@@ -14,7 +14,7 @@
 
 package com.googlesource.gerrit.plugins.auditsl4j;
 
-import com.google.gerrit.audit.SshAuditEvent;
+import com.google.gerrit.server.audit.SshAuditEvent;
 
 public class SshAuditEventFormat implements AuditFormatter<SshAuditEvent> {
   protected static final Class<?> CLASS = SshAuditEvent.class;