Merge branch 'stable-2.16'

* stable-2.16:
  ConfigServlet: use provider to get "MetaDataUpdate.User"
  Remove deprecated API field
  Remove wrongly used @Singleton
  Reformat with gjf
  Correct UI label to match API
  Ship simple-submit-ui as 'simple-submit-rules.html' instead of ssr

Change-Id: I6123b12a4d49d67f6f6d55588ad8661419369a77

src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java

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 6f36519..3db1d0f 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
@@ -39,6 +39,7 @@
 public class ConfigServlet
     implements RestReadView<ProjectResource>, RestModifyView<ProjectResource, SubmitConfig> {
   private final ProjectCache projectCache;
+  private final ProjectConfig.Factory projectConfigFactory;
   private final PermissionBackend permissionBackend;
   private final Provider<MetaDataUpdate.User> metaDataUpdateFactory;
   private final ConfigTranslator configTranslator;
@@ -48,8 +49,10 @@
       ProjectCache projectCache,
       PermissionBackend permissionBackend,
       Provider<MetaDataUpdate.User> metaDataUpdateFactory,
-      ConfigTranslator configTranslator) {
+      ConfigTranslator configTranslator,
+      ProjectConfig.Factory projectConfigFactory) {
     this.projectCache = projectCache;
+    this.projectConfigFactory = projectConfigFactory;
     this.permissionBackend = permissionBackend;
     this.metaDataUpdateFactory = metaDataUpdateFactory;
     this.configTranslator = configTranslator;
@@ -77,7 +80,7 @@
 
     IdentifiedUser user = resource.getUser().asIdentifiedUser();
     try (MetaDataUpdate md = metaDataUpdateFactory.get().create(projectName, user)) {
-      ProjectConfig projectConfig = ProjectConfig.read(md);
+      ProjectConfig projectConfig = projectConfigFactory.read(md);
       configTranslator.applyTo(inConfig, projectConfig);
       projectConfig.commit(md);
       projectCache.evict(projectName);

src/test/java/com/googlesource/gerrit/plugins/simplesubmitrules/PluginIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/simplesubmitrules/PluginIT.java b/src/test/java/com/googlesource/gerrit/plugins/simplesubmitrules/PluginIT.java
index 0bee0cb..a551618 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/simplesubmitrules/PluginIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/simplesubmitrules/PluginIT.java
@@ -63,7 +63,7 @@
 
     // Create change as user
     TestRepository<InMemoryRepository> userTestRepo = cloneProject(project, user);
-    PushOneCommit push = pushFactory.create(db, user.getIdent(), userTestRepo);
+    PushOneCommit push = pushFactory.create(user.getIdent(), userTestRepo);
     PushOneCommit.Result r = push.to("refs/for/master");
 
     // Approve as admin