From c77032cc74b2d766cb8eb69b65a205dd0d8a5887 Mon Sep 17 00:00:00 2001
From: Thomas Draebing <thomas.draebing@sap.com>
Date: Mon, 27 Jan 2020 11:20:28 +0100
Subject: [PATCH 01/14] Add MessageOfTheDay-entries to ServerInfo

The message of the day functionality was lost in the new PolyGerrit-UI,
since the original implementation relied on the server side addition of
the messages to the host page.

This change adds the messages registered to the MessageOfTheDay-
extension point to the ServerInfo, which can be fetched via Rest API.
This allows accessing this information from the new UI.

The UI elements that consume this information will be added in a
followup change.

Change-Id: I1deff5afbd812a1efaf6ad11e871544b36a5d88d
---
 Documentation/rest-api-config.txt             | 19 +++++++++++++
 .../common/MessageOfTheDayInfo.java           | 27 +++++++++++++++++++
 .../gerrit/extensions/common/ServerInfo.java  |  2 ++
 .../server/restapi/config/GetServerInfo.java  | 24 ++++++++++++++++-
 4 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 java/com/google/gerrit/extensions/common/MessageOfTheDayInfo.java

diff --git a/Documentation/rest-api-config.txt b/Documentation/rest-api-config.txt
index 7be8c324b4..0e4cac28f1 100644
--- a/Documentation/rest-api-config.txt
+++ b/Documentation/rest-api-config.txt
@@ -1905,6 +1905,21 @@ The maximal memory size. The value is returned with a unit abbreviation
 The number of open files.
 |============================
 
+[[message-of-the-day-info]]
+=== MessageOfTheDayInfo
+The `MessageOfTheDayInfo` entity contains information about a message
+that was registered with the `MessageOfTheDay`-extension by plugins.
+
+[options="header",cols="1,^1,5"]
+|===========================
+|Field Name     ||Description
+|`id`           ||ID of the message.
+|`redisplay`    ||
+Date and Time, when the message should be displayed again after it was dismissed
+by the user.
+|`html`         ||Message in HTML-format.
+|===========================
+
 [[plugin-config-info]]
 === PluginConfigInfo
 The `PluginConfigInfo` entity contains information about Gerrit
@@ -1958,6 +1973,10 @@ information about Gerrit
 Information about the configuration from the
 link:config-gerrit.html#gerrit[gerrit] section as link:#gerrit-info[
 GerritInfo] entity.
+|`messages`                ||
+List of messages registered with the `MessageOfTheDay`-
+extension containing link:#message-of-the-day-info[
+MessageOfTheDayInfo] entities.
 |`note_db_enabled`         |not set if `false`|
 Whether the NoteDb storage backend is fully enabled.
 |`plugin`                  ||
diff --git a/java/com/google/gerrit/extensions/common/MessageOfTheDayInfo.java b/java/com/google/gerrit/extensions/common/MessageOfTheDayInfo.java
new file mode 100644
index 0000000000..f752f86a64
--- /dev/null
+++ b/java/com/google/gerrit/extensions/common/MessageOfTheDayInfo.java
@@ -0,0 +1,27 @@
+// Copyright (C) 2020 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.extensions.common;
+
+import java.util.Date;
+
+/** REST API representation of a "message of the day". */
+public class MessageOfTheDayInfo {
+  /** The ID of the message. */
+  public String id;
+  /** The date and time the message will be displayed again after being dismissed by the user. */
+  public Date redisplay;
+  /** The message in HTML-format. */
+  public String html;
+}
diff --git a/java/com/google/gerrit/extensions/common/ServerInfo.java b/java/com/google/gerrit/extensions/common/ServerInfo.java
index 8904f0a03b..27cf529a24 100644
--- a/java/com/google/gerrit/extensions/common/ServerInfo.java
+++ b/java/com/google/gerrit/extensions/common/ServerInfo.java
@@ -14,6 +14,7 @@
 
 package com.google.gerrit.extensions.common;
 
+import java.util.List;
 import java.util.Map;
 
 public class ServerInfo {
@@ -22,6 +23,7 @@ public class ServerInfo {
   public ChangeConfigInfo change;
   public DownloadInfo download;
   public GerritInfo gerrit;
+  public List<MessageOfTheDayInfo> messages;
   public Boolean noteDbEnabled;
   public PluginConfigInfo plugin;
   public SshdInfo sshd;
diff --git a/java/com/google/gerrit/server/restapi/config/GetServerInfo.java b/java/com/google/gerrit/server/restapi/config/GetServerInfo.java
index eca26c34a5..04f4f8a824 100644
--- a/java/com/google/gerrit/server/restapi/config/GetServerInfo.java
+++ b/java/com/google/gerrit/server/restapi/config/GetServerInfo.java
@@ -27,6 +27,7 @@ import com.google.gerrit.extensions.common.ChangeConfigInfo;
 import com.google.gerrit.extensions.common.DownloadInfo;
 import com.google.gerrit.extensions.common.DownloadSchemeInfo;
 import com.google.gerrit.extensions.common.GerritInfo;
+import com.google.gerrit.extensions.common.MessageOfTheDayInfo;
 import com.google.gerrit.extensions.common.PluginConfigInfo;
 import com.google.gerrit.extensions.common.ReceiveInfo;
 import com.google.gerrit.extensions.common.ServerInfo;
@@ -36,7 +37,9 @@ import com.google.gerrit.extensions.common.UserConfigInfo;
 import com.google.gerrit.extensions.config.CloneCommand;
 import com.google.gerrit.extensions.config.DownloadCommand;
 import com.google.gerrit.extensions.config.DownloadScheme;
+import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.extensions.restapi.RestReadView;
+import com.google.gerrit.extensions.systemstatus.MessageOfTheDay;
 import com.google.gerrit.extensions.webui.WebUiPlugin;
 import com.google.gerrit.server.EnableSignedPush;
 import com.google.gerrit.server.account.AccountVisibilityProvider;
@@ -69,6 +72,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -100,6 +104,7 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
   private final GerritOptions gerritOptions;
   private final ChangeIndexCollection indexes;
   private final SitePaths sitePaths;
+  private final DynamicSet<MessageOfTheDay> messages;
 
   @Inject
   public GetServerInfo(
@@ -123,7 +128,8 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
       AgreementJson agreementJson,
       GerritOptions gerritOptions,
       ChangeIndexCollection indexes,
-      SitePaths sitePaths) {
+      SitePaths sitePaths,
+      DynamicSet<MessageOfTheDay> motd) {
     this.config = config;
     this.accountVisibilityProvider = accountVisibilityProvider;
     this.authConfig = authConfig;
@@ -145,6 +151,7 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
     this.gerritOptions = gerritOptions;
     this.indexes = indexes;
     this.sitePaths = sitePaths;
+    this.messages = motd;
   }
 
   @Override
@@ -155,6 +162,7 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
     info.change = getChangeInfo();
     info.download = getDownloadInfo();
     info.gerrit = getGerritInfo();
+    info.messages = getMessages();
     info.noteDbEnabled = toBoolean(isNoteDbEnabled());
     info.plugin = getPluginInfo();
     info.defaultTheme = getDefaultTheme();
@@ -325,6 +333,20 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
     return CharMatcher.is('/').trimTrailingFrom(docUrl) + '/';
   }
 
+  private List<MessageOfTheDayInfo> getMessages() {
+    return this.messages.stream()
+        .filter(motd -> !Strings.isNullOrEmpty(motd.getHtmlMessage()))
+        .map(
+            motd -> {
+              MessageOfTheDayInfo m = new MessageOfTheDayInfo();
+              m.id = motd.getMessageId();
+              m.redisplay = motd.getRedisplay();
+              m.html = motd.getHtmlMessage();
+              return m;
+            })
+        .collect(toList());
+  }
+
   private boolean isNoteDbEnabled() {
     return migration.readChanges();
   }

From 1fbf53df6049cdadc8b2b2dd5bb61a19eefd90d4 Mon Sep 17 00:00:00 2001
From: Thomas Draebing <thomas.draebing@sap.com>
Date: Mon, 27 Jan 2020 17:55:55 +0100
Subject: [PATCH 02/14] Add UI element to display messages of the day

This change adds an UI element that displays messages registered with
the MessageOfTheDay extension point. The messages will be displayed
below the main navigation header. This functionality was already part
of the GWT-UI, but was never migrated to the new UI.

The messages can be dismissed by a button click, that will create a
cookie that will prevent the message from being displayed again until
the redisplay time configured with the message.

The content of the message can be HTML. Depending on where the message-
content is coming from, this might be harmful. In case of the
messageoftheday plugin, the message is added as a config from the Gerrit
server site, which can probably be considered save. However, in a future
change rendering HTML should be made configurable and switched off by
default. Text should then be rendered using `gr-formatted-text`.

Change-Id: I2cbbcbcd49734b645701b9fac62a016a269d37f2
---
 .../gr-message-header/gr-message-header.html  | 41 +++++++++++++
 .../gr-message-header/gr-message-header.js    | 52 ++++++++++++++++
 .../gr-message-header_test.html               | 60 +++++++++++++++++++
 polygerrit-ui/app/elements/gr-app.html        |  7 +++
 polygerrit-ui/app/elements/gr-app.js          |  4 ++
 5 files changed, 164 insertions(+)
 create mode 100644 polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.html
 create mode 100644 polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.js
 create mode 100644 polygerrit-ui/app/elements/core/gr-message-header/gr-message-header_test.html

diff --git a/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.html b/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.html
new file mode 100644
index 0000000000..b2b382ca50
--- /dev/null
+++ b/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.html
@@ -0,0 +1,41 @@
+<!--
+@license
+Copyright (C) 2020 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<link rel="import" href="../../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../shared/gr-button/gr-button.html">
+
+<dom-module id="gr-message-header">
+  <template>
+    <style include="shared-styles">
+      #container {
+        background-color: lightyellow;
+        display: flex;
+        height: fit-content;
+        justify-content: space-between;
+        padding: 1em;
+      }
+    </style>
+    <div id="container" hidden$="[[_hidden]]">
+      <div id="message"></div>
+      <gr-button id="dismissMessageBtn"
+        link
+        on-tap="_handleDismissMessage">Dismiss</gr-button>
+    </div>
+    <gr-rest-api-interface id="restAPI"></gr-rest-api-interface>
+  </template>
+  <script src="../../../scripts/util.js"></script>
+  <script src="gr-message-header.js"></script>
+</dom-module>
diff --git a/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.js b/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.js
new file mode 100644
index 0000000000..fac4a6a399
--- /dev/null
+++ b/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.js
@@ -0,0 +1,52 @@
+/**
+ * @license
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+(function() {
+  'use strict';
+
+  Polymer({
+    is: 'gr-message-header',
+
+    properties: {
+      message: {
+        type: Object,
+        reflectToAttribute: true,
+      },
+      _hidden: {
+        type: Boolean,
+        value: true,
+      },
+    },
+
+    attached() {
+      if (!this.message || !this.message.html) {
+        return;
+      }
+      this._isHidden();
+      this.$.message.innerHTML = this.message.html;
+    },
+
+    _handleDismissMessage() {
+      document.cookie =
+        `msg-${this.message.id}=1; expires=${this.message.redisplay}`;
+      this._hidden = true;
+    },
+
+    _isHidden() {
+      this._hidden = window.util.getCookie(`msg-${this.message.id}`) === '1';
+    },
+  });
+})();
diff --git a/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header_test.html b/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header_test.html
new file mode 100644
index 0000000000..c275e55345
--- /dev/null
+++ b/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header_test.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<!--
+@license
+Copyright (C) 2020 The Android Open Source Project
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
+<title>gr-message-header</title>
+
+<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>
+<script src="../../../bower_components/web-component-tester/browser.js"></script>
+<link rel="import" href="../../../test/common-test-setup.html"/>
+<link rel="import" href="gr-message-header.html">
+
+<script>void(0);</script>
+
+<test-fixture id="basic">
+  <template>
+    <gr-message-header></gr-message-header>
+  </template>
+</test-fixture>
+
+<script>
+  suite('gr-message-header tests', () => {
+    let element;
+
+    setup(() => {
+      element = fixture('basic');
+    });
+
+    test('show message', () => {
+      element.message = {html: 'This is a test message.'};
+      element.attached();
+      assert.equal(element.$.message.innerHTML, element.message.html);
+    });
+
+    test('hide message on dismiss', () => {
+      element.message = {html: 'This is a test message.', id: 'test'};
+      element.attached();
+      MockInteractions.tap(element.$.dismissMessageBtn);
+      assert.isTrue(element.$.container.hidden);
+      assert.isTrue(document.cookie.includes('msg-test=1'));
+
+      element.attached();
+      assert.isTrue(element.$.container.hidden);
+    });
+  });
+</script>
diff --git a/polygerrit-ui/app/elements/gr-app.html b/polygerrit-ui/app/elements/gr-app.html
index 3a9719d5b9..4fff9e6221 100644
--- a/polygerrit-ui/app/elements/gr-app.html
+++ b/polygerrit-ui/app/elements/gr-app.html
@@ -55,6 +55,7 @@ limitations under the License.
 <link rel="import" href="./core/gr-error-manager/gr-error-manager.html">
 <link rel="import" href="./core/gr-keyboard-shortcuts-dialog/gr-keyboard-shortcuts-dialog.html">
 <link rel="import" href="./core/gr-main-header/gr-main-header.html">
+<link rel="import" href="./core/gr-message-header/gr-message-header.html">
 <link rel="import" href="./core/gr-navigation/gr-navigation.html">
 <link rel="import" href="./core/gr-reporting/gr-reporting.html">
 <link rel="import" href="./core/gr-router/gr-router.html">
@@ -158,6 +159,12 @@ limitations under the License.
           class$="[[_computeShadowClass(_isShadowDom)]]">
       </gr-main-header>
     </gr-fixed-panel>
+    <template
+        is="dom-repeat"
+        items="[[_getMessages(_serverConfig)]]"
+        as="message">
+      <gr-message-header message="{{message}}"></gr-message-header>
+    </template>
     <main>
       <template is="dom-if" if="[[_showChangeListView]]" restamp="true">
         <gr-change-list-view
diff --git a/polygerrit-ui/app/elements/gr-app.js b/polygerrit-ui/app/elements/gr-app.js
index f48951bd53..ea7e86dc0b 100644
--- a/polygerrit-ui/app/elements/gr-app.js
+++ b/polygerrit-ui/app/elements/gr-app.js
@@ -339,6 +339,10 @@
           config.gerrit.web_uis && config.gerrit.web_uis.includes('GWT');
     },
 
+    _getMessages(config) {
+      return config.messages ? config.messages : [];
+    },
+
     _handlePageError(e) {
       const props = [
         '_showChangeListView',

From cfff720610374fe538649f272a762569bb785998 Mon Sep 17 00:00:00 2001
From: Thomas Draebing <thomas.draebing@sap.com>
Date: Fri, 31 Jan 2020 10:45:23 +0100
Subject: [PATCH 03/14] Document MessageOfTheDay extension

Change-Id: I99894e9d9b0376e11ac47796cee4c9e2e0c9be5a
---
 Documentation/dev-plugins.txt     | 34 +++++++++++++++++++++++++++++++
 Documentation/rest-api-config.txt |  8 +++++---
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt
index 974e3706ca..64cae2d5a6 100644
--- a/Documentation/dev-plugins.txt
+++ b/Documentation/dev-plugins.txt
@@ -2954,6 +2954,40 @@ to change in order to be compliant. These requirements should be kept once they
 are met, but marked as `OK`. If the requirements were not displayed, reviewers
 would need to use their precious time to manually check that they were met.
 
+[[message-of-the-day]]
+== Posting Messages (Of The Day) to the UI
+Gerrit provides an extension point that enables plugins to implement a method to
+collect messages that will then be shown below the main header in the Gerrit UI.
+
+[source, java]
+----
+import com.google.gerrit.extensions.systemstatus.MessageOfTheDay;
+
+@Singleton
+class MessageOfTheDayImpl extends MessageOfTheDay {
+
+  private final String id;
+  private final String msg;
+
+  public MessageOfTheDayImpl() {
+    id = "hello";
+    msg = "I just wanted to say <b>hello</b>.";
+  }
+
+  @Override
+  public String getHtmlMessage() {
+    return msg;
+  }
+
+  @Override
+  public String getMessageId() {
+    return id;
+  }
+}
+----
+
+Note, that the message will be added as HTML and parsed into the DOM. Thus,
+plugins using this extension should ensure that the message content is safe.
 
 == SEE ALSO
 
diff --git a/Documentation/rest-api-config.txt b/Documentation/rest-api-config.txt
index 0e4cac28f1..905c3ef830 100644
--- a/Documentation/rest-api-config.txt
+++ b/Documentation/rest-api-config.txt
@@ -1908,7 +1908,8 @@ The number of open files.
 [[message-of-the-day-info]]
 === MessageOfTheDayInfo
 The `MessageOfTheDayInfo` entity contains information about a message
-that was registered with the `MessageOfTheDay`-extension by plugins.
+that was registered with the
+link:dev-plugins.html#message-of-the-day[MessageOfTheDay]-extension by plugins.
 
 [options="header",cols="1,^1,5"]
 |===========================
@@ -1974,8 +1975,9 @@ Information about the configuration from the
 link:config-gerrit.html#gerrit[gerrit] section as link:#gerrit-info[
 GerritInfo] entity.
 |`messages`                ||
-List of messages registered with the `MessageOfTheDay`-
-extension containing link:#message-of-the-day-info[
+List of messages registered with the
+link:dev-plugins.html#message-of-the-day[MessageOfTheDay]-extension
+containing link:#message-of-the-day-info[
 MessageOfTheDayInfo] entities.
 |`note_db_enabled`         |not set if `false`|
 Whether the NoteDb storage backend is fully enabled.

From 15753c282e9fcb44fa049788136505071a339ad5 Mon Sep 17 00:00:00 2001
From: Sven Selberg <svense@axis.com>
Date: Mon, 3 Feb 2020 11:33:30 +0100
Subject: [PATCH 04/14] Tests: Use helper method for config change

Use enableCreateNewChangeForAllNotInTarget() from AbstractDaemonTest
instead of duplicating the code.

Change-Id: Ic2fe137533a7b6ad33fc1705947473766730bf56
---
 .../acceptance/git/AbstractPushForReview.java  | 18 ++----------------
 .../acceptance/rest/change/AbstractSubmit.java | 10 +---------
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
index 398ed84069..2acc3cd084 100644
--- a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
+++ b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
@@ -1440,14 +1440,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
 
   @Test
   public void pushSameCommitTwice() throws Exception {
-    try (ProjectConfigUpdate u = updateProject(project)) {
-      u.getConfig()
-          .getProject()
-          .setBooleanConfig(
-              BooleanProjectConfig.CREATE_NEW_CHANGE_FOR_ALL_NOT_IN_TARGET,
-              InheritableBoolean.TRUE);
-      u.save();
-    }
+    enableCreateNewChangeForAllNotInTarget();
 
     PushOneCommit push =
         pushFactory.create(
@@ -1469,14 +1462,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
 
   @Test
   public void pushSameCommitTwiceWhenIndexFailed() throws Exception {
-    try (ProjectConfigUpdate u = updateProject(project)) {
-      u.getConfig()
-          .getProject()
-          .setBooleanConfig(
-              BooleanProjectConfig.CREATE_NEW_CHANGE_FOR_ALL_NOT_IN_TARGET,
-              InheritableBoolean.TRUE);
-      u.save();
-    }
+    enableCreateNewChangeForAllNotInTarget();
 
     PushOneCommit push =
         pushFactory.create(
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
index 08a76e4773..6622baeccf 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
@@ -59,7 +59,6 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException;
 import com.google.gerrit.extensions.restapi.RestApiException;
 import com.google.gerrit.extensions.webui.UiAction;
 import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.client.BooleanProjectConfig;
 import com.google.gerrit.reviewdb.client.Branch;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.PatchSet;
@@ -574,14 +573,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
     //  |
     // C0 -- Master
     //
-    try (ProjectConfigUpdate u = updateProject(project)) {
-      u.getConfig()
-          .getProject()
-          .setBooleanConfig(
-              BooleanProjectConfig.CREATE_NEW_CHANGE_FOR_ALL_NOT_IN_TARGET,
-              InheritableBoolean.TRUE);
-      u.save();
-    }
+    enableCreateNewChangeForAllNotInTarget();
 
     PushOneCommit push1 =
         pushFactory.create(

From 5623d66a99bc34e7937ee0414e75aae689af2739 Mon Sep 17 00:00:00 2001
From: Thomas Draebing <thomas.draebing@sap.com>
Date: Mon, 3 Feb 2020 15:25:43 +0100
Subject: [PATCH 05/14] Revert "Document MessageOfTheDay extension"

This reverts commit cfff720610374fe538649f272a762569bb785998.

The message of the day functionality is still heavily depended on
components of Gerrit core. It is planned to move this functionality
completely to the plugin. Since it was not usable with the new UI for
a long while, the functionality will be removed completely until
then.

Change-Id: I6f8b13a92e8b20efce0748c27db631bacbda3123
---
 Documentation/dev-plugins.txt     | 34 -------------------------------
 Documentation/rest-api-config.txt |  8 +++-----
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt
index 3cde444707..e481d40666 100644
--- a/Documentation/dev-plugins.txt
+++ b/Documentation/dev-plugins.txt
@@ -2766,40 +2766,6 @@ class ApiQpsEnforcer implements QuotaEnforcer {
 }
 ----
 
-[[message-of-the-day]]
-== Posting Messages (Of The Day) to the UI
-Gerrit provides an extension point that enables plugins to implement a method to
-collect messages that will then be shown below the main header in the Gerrit UI.
-
-[source, java]
-----
-import com.google.gerrit.extensions.systemstatus.MessageOfTheDay;
-
-@Singleton
-class MessageOfTheDayImpl extends MessageOfTheDay {
-
-  private final String id;
-  private final String msg;
-
-  public MessageOfTheDayImpl() {
-    id = "hello";
-    msg = "I just wanted to say <b>hello</b>.";
-  }
-
-  @Override
-  public String getHtmlMessage() {
-    return msg;
-  }
-
-  @Override
-  public String getMessageId() {
-    return id;
-  }
-}
-----
-
-Note, that the message will be added as HTML and parsed into the DOM. Thus,
-plugins using this extension should ensure that the message content is safe.
 
 == SEE ALSO
 
diff --git a/Documentation/rest-api-config.txt b/Documentation/rest-api-config.txt
index 867016bad3..c83ed103d7 100644
--- a/Documentation/rest-api-config.txt
+++ b/Documentation/rest-api-config.txt
@@ -1899,8 +1899,7 @@ The number of open files.
 [[message-of-the-day-info]]
 === MessageOfTheDayInfo
 The `MessageOfTheDayInfo` entity contains information about a message
-that was registered with the
-link:dev-plugins.html#message-of-the-day[MessageOfTheDay]-extension by plugins.
+that was registered with the `MessageOfTheDay`-extension by plugins.
 
 [options="header",cols="1,^1,5"]
 |===========================
@@ -1966,9 +1965,8 @@ Information about the configuration from the
 link:config-gerrit.html#gerrit[gerrit] section as link:#gerrit-info[
 GerritInfo] entity.
 |`messages`                ||
-List of messages registered with the
-link:dev-plugins.html#message-of-the-day[MessageOfTheDay]-extension
-containing link:#message-of-the-day-info[
+List of messages registered with the `MessageOfTheDay`-
+extension containing link:#message-of-the-day-info[
 MessageOfTheDayInfo] entities.
 |`note_db_enabled`         |not set if `false`|
 Whether the NoteDb storage backend is fully enabled.

From 265559f5ad83a24379193d2bd5ce05d32ab6bc3c Mon Sep 17 00:00:00 2001
From: Thomas Draebing <thomas.draebing@sap.com>
Date: Mon, 3 Feb 2020 15:29:06 +0100
Subject: [PATCH 06/14] Revert "Add UI element to display messages of the day"

This reverts commit 1fbf53df6049cdadc8b2b2dd5bb61a19eefd90d4.

The message of the day functionality is still heavily depended on
components of Gerrit core. It is planned to move this functionality
completely to the plugin. Since it was not usable with the new UI for
a long while, the functionality will be removed completely until
then.

Change-Id: I7a1a0470932a0ba6275a54a4bc52b34237a219eb
---
 .../gr-message-header/gr-message-header.html  | 41 -------------
 .../gr-message-header/gr-message-header.js    | 52 ----------------
 .../gr-message-header_test.html               | 60 -------------------
 polygerrit-ui/app/elements/gr-app.html        |  7 ---
 polygerrit-ui/app/elements/gr-app.js          |  4 --
 5 files changed, 164 deletions(-)
 delete mode 100644 polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.html
 delete mode 100644 polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.js
 delete mode 100644 polygerrit-ui/app/elements/core/gr-message-header/gr-message-header_test.html

diff --git a/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.html b/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.html
deleted file mode 100644
index b2b382ca50..0000000000
--- a/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-@license
-Copyright (C) 2020 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<link rel="import" href="../../../bower_components/polymer/polymer.html">
-<link rel="import" href="../../shared/gr-button/gr-button.html">
-
-<dom-module id="gr-message-header">
-  <template>
-    <style include="shared-styles">
-      #container {
-        background-color: lightyellow;
-        display: flex;
-        height: fit-content;
-        justify-content: space-between;
-        padding: 1em;
-      }
-    </style>
-    <div id="container" hidden$="[[_hidden]]">
-      <div id="message"></div>
-      <gr-button id="dismissMessageBtn"
-        link
-        on-tap="_handleDismissMessage">Dismiss</gr-button>
-    </div>
-    <gr-rest-api-interface id="restAPI"></gr-rest-api-interface>
-  </template>
-  <script src="../../../scripts/util.js"></script>
-  <script src="gr-message-header.js"></script>
-</dom-module>
diff --git a/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.js b/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.js
deleted file mode 100644
index fac4a6a399..0000000000
--- a/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * @license
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-(function() {
-  'use strict';
-
-  Polymer({
-    is: 'gr-message-header',
-
-    properties: {
-      message: {
-        type: Object,
-        reflectToAttribute: true,
-      },
-      _hidden: {
-        type: Boolean,
-        value: true,
-      },
-    },
-
-    attached() {
-      if (!this.message || !this.message.html) {
-        return;
-      }
-      this._isHidden();
-      this.$.message.innerHTML = this.message.html;
-    },
-
-    _handleDismissMessage() {
-      document.cookie =
-        `msg-${this.message.id}=1; expires=${this.message.redisplay}`;
-      this._hidden = true;
-    },
-
-    _isHidden() {
-      this._hidden = window.util.getCookie(`msg-${this.message.id}`) === '1';
-    },
-  });
-})();
diff --git a/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header_test.html b/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header_test.html
deleted file mode 100644
index c275e55345..0000000000
--- a/polygerrit-ui/app/elements/core/gr-message-header/gr-message-header_test.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<!--
-@license
-Copyright (C) 2020 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
-<title>gr-message-header</title>
-
-<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>
-<script src="../../../bower_components/web-component-tester/browser.js"></script>
-<link rel="import" href="../../../test/common-test-setup.html"/>
-<link rel="import" href="gr-message-header.html">
-
-<script>void(0);</script>
-
-<test-fixture id="basic">
-  <template>
-    <gr-message-header></gr-message-header>
-  </template>
-</test-fixture>
-
-<script>
-  suite('gr-message-header tests', () => {
-    let element;
-
-    setup(() => {
-      element = fixture('basic');
-    });
-
-    test('show message', () => {
-      element.message = {html: 'This is a test message.'};
-      element.attached();
-      assert.equal(element.$.message.innerHTML, element.message.html);
-    });
-
-    test('hide message on dismiss', () => {
-      element.message = {html: 'This is a test message.', id: 'test'};
-      element.attached();
-      MockInteractions.tap(element.$.dismissMessageBtn);
-      assert.isTrue(element.$.container.hidden);
-      assert.isTrue(document.cookie.includes('msg-test=1'));
-
-      element.attached();
-      assert.isTrue(element.$.container.hidden);
-    });
-  });
-</script>
diff --git a/polygerrit-ui/app/elements/gr-app.html b/polygerrit-ui/app/elements/gr-app.html
index 19965e7e8e..8c50358992 100644
--- a/polygerrit-ui/app/elements/gr-app.html
+++ b/polygerrit-ui/app/elements/gr-app.html
@@ -59,7 +59,6 @@ limitations under the License.
 <link rel="import" href="./core/gr-error-manager/gr-error-manager.html">
 <link rel="import" href="./core/gr-keyboard-shortcuts-dialog/gr-keyboard-shortcuts-dialog.html">
 <link rel="import" href="./core/gr-main-header/gr-main-header.html">
-<link rel="import" href="./core/gr-message-header/gr-message-header.html">
 <link rel="import" href="./core/gr-navigation/gr-navigation.html">
 <link rel="import" href="./core/gr-reporting/gr-reporting.html">
 <link rel="import" href="./core/gr-router/gr-router.html">
@@ -165,12 +164,6 @@ limitations under the License.
           on-mobile-search="_mobileSearchToggle">
       </gr-main-header>
     </gr-fixed-panel>
-    <template
-        is="dom-repeat"
-        items="[[_getMessages(_serverConfig)]]"
-        as="message">
-      <gr-message-header message="{{message}}"></gr-message-header>
-    </template>
     <main>
       <gr-smart-search
           id="search"
diff --git a/polygerrit-ui/app/elements/gr-app.js b/polygerrit-ui/app/elements/gr-app.js
index 0f7e54a32e..b89d90ede7 100644
--- a/polygerrit-ui/app/elements/gr-app.js
+++ b/polygerrit-ui/app/elements/gr-app.js
@@ -341,10 +341,6 @@
       this.$.header.unfloat();
     },
 
-    _getMessages(config) {
-      return config.messages ? config.messages : [];
-    },
-
     _handlePageError(e) {
       const props = [
         '_showChangeListView',

From c9c27621607853b1f781b3a5a3a5d8e23e5282f5 Mon Sep 17 00:00:00 2001
From: Thomas Draebing <thomas.draebing@sap.com>
Date: Mon, 3 Feb 2020 15:31:21 +0100
Subject: [PATCH 07/14] Revert "Add MessageOfTheDay-entries to ServerInfo"

This reverts commit c77032cc74b2d766cb8eb69b65a205dd0d8a5887.

The message of the day functionality is still heavily depended on
components of Gerrit core. It is planned to move this functionality
completely to the plugin. Since it was not usable with the new UI for
a long while, the functionality will be removed completely until
then.

Change-Id: I7a426d1814f29b3674283ee22132cee326894470
---
 Documentation/rest-api-config.txt             | 19 -------------
 .../common/MessageOfTheDayInfo.java           | 27 -------------------
 .../gerrit/extensions/common/ServerInfo.java  |  3 ---
 .../server/restapi/config/GetServerInfo.java  | 24 +----------------
 4 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 java/com/google/gerrit/extensions/common/MessageOfTheDayInfo.java

diff --git a/Documentation/rest-api-config.txt b/Documentation/rest-api-config.txt
index c83ed103d7..93591120e7 100644
--- a/Documentation/rest-api-config.txt
+++ b/Documentation/rest-api-config.txt
@@ -1896,21 +1896,6 @@ The maximal memory size. The value is returned with a unit abbreviation
 The number of open files.
 |============================
 
-[[message-of-the-day-info]]
-=== MessageOfTheDayInfo
-The `MessageOfTheDayInfo` entity contains information about a message
-that was registered with the `MessageOfTheDay`-extension by plugins.
-
-[options="header",cols="1,^1,5"]
-|===========================
-|Field Name     ||Description
-|`id`           ||ID of the message.
-|`redisplay`    ||
-Date and Time, when the message should be displayed again after it was dismissed
-by the user.
-|`html`         ||Message in HTML-format.
-|===========================
-
 [[plugin-config-info]]
 === PluginConfigInfo
 The `PluginConfigInfo` entity contains information about Gerrit
@@ -1964,10 +1949,6 @@ information about Gerrit
 Information about the configuration from the
 link:config-gerrit.html#gerrit[gerrit] section as link:#gerrit-info[
 GerritInfo] entity.
-|`messages`                ||
-List of messages registered with the `MessageOfTheDay`-
-extension containing link:#message-of-the-day-info[
-MessageOfTheDayInfo] entities.
 |`note_db_enabled`         |not set if `false`|
 Whether the NoteDb storage backend is fully enabled.
 |`plugin`                  ||
diff --git a/java/com/google/gerrit/extensions/common/MessageOfTheDayInfo.java b/java/com/google/gerrit/extensions/common/MessageOfTheDayInfo.java
deleted file mode 100644
index f752f86a64..0000000000
--- a/java/com/google/gerrit/extensions/common/MessageOfTheDayInfo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (C) 2020 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.gerrit.extensions.common;
-
-import java.util.Date;
-
-/** REST API representation of a "message of the day". */
-public class MessageOfTheDayInfo {
-  /** The ID of the message. */
-  public String id;
-  /** The date and time the message will be displayed again after being dismissed by the user. */
-  public Date redisplay;
-  /** The message in HTML-format. */
-  public String html;
-}
diff --git a/java/com/google/gerrit/extensions/common/ServerInfo.java b/java/com/google/gerrit/extensions/common/ServerInfo.java
index 1d7de26564..82d5bc8061 100644
--- a/java/com/google/gerrit/extensions/common/ServerInfo.java
+++ b/java/com/google/gerrit/extensions/common/ServerInfo.java
@@ -14,15 +14,12 @@
 
 package com.google.gerrit.extensions.common;
 
-import java.util.List;
-
 public class ServerInfo {
   public AccountsInfo accounts;
   public AuthInfo auth;
   public ChangeConfigInfo change;
   public DownloadInfo download;
   public GerritInfo gerrit;
-  public List<MessageOfTheDayInfo> messages;
   public Boolean noteDbEnabled;
   public PluginConfigInfo plugin;
   public SshdInfo sshd;
diff --git a/java/com/google/gerrit/server/restapi/config/GetServerInfo.java b/java/com/google/gerrit/server/restapi/config/GetServerInfo.java
index cfd9f580ea..aa0e350481 100644
--- a/java/com/google/gerrit/server/restapi/config/GetServerInfo.java
+++ b/java/com/google/gerrit/server/restapi/config/GetServerInfo.java
@@ -26,7 +26,6 @@ import com.google.gerrit.extensions.common.ChangeConfigInfo;
 import com.google.gerrit.extensions.common.DownloadInfo;
 import com.google.gerrit.extensions.common.DownloadSchemeInfo;
 import com.google.gerrit.extensions.common.GerritInfo;
-import com.google.gerrit.extensions.common.MessageOfTheDayInfo;
 import com.google.gerrit.extensions.common.PluginConfigInfo;
 import com.google.gerrit.extensions.common.ReceiveInfo;
 import com.google.gerrit.extensions.common.ServerInfo;
@@ -36,9 +35,7 @@ import com.google.gerrit.extensions.common.UserConfigInfo;
 import com.google.gerrit.extensions.config.CloneCommand;
 import com.google.gerrit.extensions.config.DownloadCommand;
 import com.google.gerrit.extensions.config.DownloadScheme;
-import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.extensions.restapi.RestReadView;
-import com.google.gerrit.extensions.systemstatus.MessageOfTheDay;
 import com.google.gerrit.extensions.webui.WebUiPlugin;
 import com.google.gerrit.server.EnableSignedPush;
 import com.google.gerrit.server.account.AccountVisibilityProvider;
@@ -68,7 +65,6 @@ import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import org.eclipse.jgit.lib.Config;
@@ -93,7 +89,6 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
   private final AgreementJson agreementJson;
   private final ChangeIndexCollection indexes;
   private final SitePaths sitePaths;
-  private final DynamicSet<MessageOfTheDay> messages;
 
   @Inject
   public GetServerInfo(
@@ -115,8 +110,7 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
       ProjectCache projectCache,
       AgreementJson agreementJson,
       ChangeIndexCollection indexes,
-      SitePaths sitePaths,
-      DynamicSet<MessageOfTheDay> motd) {
+      SitePaths sitePaths) {
     this.config = config;
     this.accountVisibilityProvider = accountVisibilityProvider;
     this.authConfig = authConfig;
@@ -136,7 +130,6 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
     this.agreementJson = agreementJson;
     this.indexes = indexes;
     this.sitePaths = sitePaths;
-    this.messages = motd;
   }
 
   @Override
@@ -147,7 +140,6 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
     info.change = getChangeInfo();
     info.download = getDownloadInfo();
     info.gerrit = getGerritInfo();
-    info.messages = getMessages();
     info.noteDbEnabled = true;
     info.plugin = getPluginInfo();
     info.defaultTheme = getDefaultTheme();
@@ -309,20 +301,6 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
     return CharMatcher.is('/').trimTrailingFrom(docUrl) + '/';
   }
 
-  private List<MessageOfTheDayInfo> getMessages() {
-    return this.messages.stream()
-        .filter(motd -> !Strings.isNullOrEmpty(motd.getHtmlMessage()))
-        .map(
-            motd -> {
-              MessageOfTheDayInfo m = new MessageOfTheDayInfo();
-              m.id = motd.getMessageId();
-              m.redisplay = motd.getRedisplay();
-              m.html = motd.getHtmlMessage();
-              return m;
-            })
-        .collect(toList());
-  }
-
   private PluginConfigInfo getPluginInfo() {
     PluginConfigInfo info = new PluginConfigInfo();
     info.hasAvatars = toBoolean(avatar.hasImplementation());

From 5a89a5594069442994dee59b021a37b525c5521b Mon Sep 17 00:00:00 2001
From: Thomas Draebing <thomas.draebing@sap.com>
Date: Mon, 3 Feb 2020 15:32:38 +0100
Subject: [PATCH 08/14] Remove MessageOfTheDay extension

The message of the day functionality was heavily depended on
components of Gerrit core. In Gerrit-3.0 only the extension point was
left of this feature, but it wasn't used anywhere to actually display
the messages registered with it. While this feature was reenabled for
the PolyGerrit-UI in Gerrit 2.16, for compatibility reasons, it still
depended on the components in Gerrit core. It is planned to move this
functionality completely to the plugin. Since it was not usable with
the new UI for a long while, the functionality will be removed
completely until then.

Change-Id: If653e7042db981e55d08fa29e14dd9201fb22627
---
 .../systemstatus/MessageOfTheDay.java         | 63 -------------------
 .../server/config/GerritGlobalModule.java     |  2 -
 2 files changed, 65 deletions(-)
 delete mode 100644 java/com/google/gerrit/extensions/systemstatus/MessageOfTheDay.java

diff --git a/java/com/google/gerrit/extensions/systemstatus/MessageOfTheDay.java b/java/com/google/gerrit/extensions/systemstatus/MessageOfTheDay.java
deleted file mode 100644
index 180a0e6635..0000000000
--- a/java/com/google/gerrit/extensions/systemstatus/MessageOfTheDay.java
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (C) 2014 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.gerrit.extensions.systemstatus;
-
-import com.google.gerrit.extensions.annotations.ExtensionPoint;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-
-/**
- * Supplies a message of the day when the page is first loaded.
- *
- * <pre>
- * DynamicSet.bind(binder(), MessageOfTheDay.class).to(MyMessage.class);
- * </pre>
- */
-@ExtensionPoint
-public abstract class MessageOfTheDay {
-  /**
-   * Retrieve the message of the day as an HTML fragment.
-   *
-   * @return message as an HTML fragment; null if no message is available.
-   */
-  public abstract String getHtmlMessage();
-
-  /**
-   * Unique identifier for this message.
-   *
-   * <p>Messages with the same identifier will be hidden from the user until redisplay has occurred.
-   *
-   * @return unique message identifier. This identifier should be unique within the server.
-   */
-  public abstract String getMessageId();
-
-  /**
-   * When should the message be displayed?
-   *
-   * <p>Default implementation returns {@code tomorrow at 00:00:00 GMT}.
-   *
-   * @return a future date after which the message should be redisplayed.
-   */
-  public Date getRedisplay() {
-    Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
-    cal.set(Calendar.HOUR_OF_DAY, 0);
-    cal.set(Calendar.MINUTE, 0);
-    cal.set(Calendar.SECOND, 0);
-    cal.set(Calendar.MILLISECOND, 0);
-    cal.add(Calendar.DAY_OF_MONTH, 1);
-    return cal.getTime();
-  }
-}
diff --git a/java/com/google/gerrit/server/config/GerritGlobalModule.java b/java/com/google/gerrit/server/config/GerritGlobalModule.java
index 59a55ab2e7..a5f25f99d3 100644
--- a/java/com/google/gerrit/server/config/GerritGlobalModule.java
+++ b/java/com/google/gerrit/server/config/GerritGlobalModule.java
@@ -61,7 +61,6 @@ import com.google.gerrit.extensions.events.WorkInProgressStateChangedListener;
 import com.google.gerrit.extensions.registration.DynamicItem;
 import com.google.gerrit.extensions.registration.DynamicMap;
 import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.extensions.systemstatus.MessageOfTheDay;
 import com.google.gerrit.extensions.webui.BranchWebLink;
 import com.google.gerrit.extensions.webui.DiffWebLink;
 import com.google.gerrit.extensions.webui.FileHistoryWebLink;
@@ -352,7 +351,6 @@ public class GerritGlobalModule extends FactoryModule {
     DynamicItem.itemOf(binder(), AvatarProvider.class);
     DynamicSet.setOf(binder(), LifecycleListener.class);
     DynamicSet.setOf(binder(), TopMenu.class);
-    DynamicSet.setOf(binder(), MessageOfTheDay.class);
     DynamicMap.mapOf(binder(), DownloadScheme.class);
     DynamicMap.mapOf(binder(), DownloadCommand.class);
     DynamicMap.mapOf(binder(), CloneCommand.class);

From baee4e5963ef7308d4f2651b51e94f5ef8eaf209 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Tue, 4 Feb 2020 09:50:50 +0900
Subject: [PATCH 09/14] CreateChange#getCommitMessage: Remove unused parameters
 and variable

The merge done in change I666ee4c2c accidentally introduced unused
parameters and an unused variable in the getCommitMessage method.

Change-Id: I25afa4519f2ab2ce5e19387ca7e38fd44247b755
---
 .../gerrit/server/restapi/change/CreateChange.java    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/java/com/google/gerrit/server/restapi/change/CreateChange.java b/java/com/google/gerrit/server/restapi/change/CreateChange.java
index d22bd0cd5f..f626db2e68 100644
--- a/java/com/google/gerrit/server/restapi/change/CreateChange.java
+++ b/java/com/google/gerrit/server/restapi/change/CreateChange.java
@@ -291,7 +291,7 @@ public class CreateChange
 
       Timestamp now = TimeUtil.nowTs();
       PersonIdent author = me.newCommitterIdent(now, serverTimeZone);
-      String commitMessage = getCommitMessage(input.subject, me, oi, mergeTip, author);
+      String commitMessage = getCommitMessage(input.subject, me);
 
       RevCommit c;
       if (input.merge != null) {
@@ -403,17 +403,10 @@ public class CreateChange
     return parentCommit;
   }
 
-  private String getCommitMessage(
-      String subject,
-      IdentifiedUser me,
-      ObjectInserter objectInserter,
-      RevCommit mergeTip,
-      PersonIdent author)
-      throws IOException {
+  private String getCommitMessage(String subject, IdentifiedUser me) {
     // Add a Change-Id line if there isn't already one
     String commitMessage = subject;
     if (ChangeIdUtil.indexOfChangeId(commitMessage, "\n") == -1) {
-      ObjectId treeId = mergeTip == null ? emptyTreeId(objectInserter) : mergeTip.getTree();
       ObjectId id = CommitMessageUtil.generateChangeId();
       commitMessage = ChangeIdUtil.insertId(commitMessage, id);
     }

From dd780721ab1c8bebbbb528050192d8d9b179b0b0 Mon Sep 17 00:00:00 2001
From: Luca Milanesio <luca.milanesio@gmail.com>
Date: Tue, 4 Feb 2020 16:01:59 +0000
Subject: [PATCH 10/14] Set version to 2.16.16

Change-Id: I3d0d1c1e89dd6bc2030056ab8a4ce09189403a06
---
 tools/maven/gerrit-acceptance-framework_pom.xml | 2 +-
 tools/maven/gerrit-extension-api_pom.xml        | 2 +-
 tools/maven/gerrit-plugin-api_pom.xml           | 2 +-
 tools/maven/gerrit-plugin-gwtui_pom.xml         | 2 +-
 tools/maven/gerrit-war_pom.xml                  | 2 +-
 version.bzl                                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/maven/gerrit-acceptance-framework_pom.xml b/tools/maven/gerrit-acceptance-framework_pom.xml
index d0607f13af..f0a50d5fb5 100644
--- a/tools/maven/gerrit-acceptance-framework_pom.xml
+++ b/tools/maven/gerrit-acceptance-framework_pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-acceptance-framework</artifactId>
-  <version>2.16.16-SNAPSHOT</version>
+  <version>2.16.16</version>
   <packaging>jar</packaging>
   <name>Gerrit Code Review - Acceptance Test Framework</name>
   <description>Framework for Gerrit's acceptance tests</description>
diff --git a/tools/maven/gerrit-extension-api_pom.xml b/tools/maven/gerrit-extension-api_pom.xml
index 470aec26d8..b6cbbea816 100644
--- a/tools/maven/gerrit-extension-api_pom.xml
+++ b/tools/maven/gerrit-extension-api_pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-extension-api</artifactId>
-  <version>2.16.16-SNAPSHOT</version>
+  <version>2.16.16</version>
   <packaging>jar</packaging>
   <name>Gerrit Code Review - Extension API</name>
   <description>API for Gerrit Extensions</description>
diff --git a/tools/maven/gerrit-plugin-api_pom.xml b/tools/maven/gerrit-plugin-api_pom.xml
index bf898655d7..71783a82b1 100644
--- a/tools/maven/gerrit-plugin-api_pom.xml
+++ b/tools/maven/gerrit-plugin-api_pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-plugin-api</artifactId>
-  <version>2.16.16-SNAPSHOT</version>
+  <version>2.16.16</version>
   <packaging>jar</packaging>
   <name>Gerrit Code Review - Plugin API</name>
   <description>API for Gerrit Plugins</description>
diff --git a/tools/maven/gerrit-plugin-gwtui_pom.xml b/tools/maven/gerrit-plugin-gwtui_pom.xml
index 498ab82b7b..602c62a230 100644
--- a/tools/maven/gerrit-plugin-gwtui_pom.xml
+++ b/tools/maven/gerrit-plugin-gwtui_pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-plugin-gwtui</artifactId>
-  <version>2.16.16-SNAPSHOT</version>
+  <version>2.16.16</version>
   <packaging>jar</packaging>
   <name>Gerrit Code Review - Plugin GWT UI</name>
   <description>Common Classes for Gerrit GWT UI Plugins</description>
diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml
index f991f6ed0f..1ce8347118 100644
--- a/tools/maven/gerrit-war_pom.xml
+++ b/tools/maven/gerrit-war_pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-war</artifactId>
-  <version>2.16.16-SNAPSHOT</version>
+  <version>2.16.16</version>
   <packaging>war</packaging>
   <name>Gerrit Code Review - WAR</name>
   <description>Gerrit WAR</description>
diff --git a/version.bzl b/version.bzl
index 3a11a12da0..8603b4fa85 100644
--- a/version.bzl
+++ b/version.bzl
@@ -2,4 +2,4 @@
 # Used by :api_install and :api_deploy targets
 # when talking to the destination repository.
 #
-GERRIT_VERSION = "2.16.16-SNAPSHOT"
+GERRIT_VERSION = "2.16.16"

From 903e586b1362a53700697b51ab2f6ef60fa71dd1 Mon Sep 17 00:00:00 2001
From: Luca Milanesio <luca.milanesio@gmail.com>
Date: Tue, 4 Feb 2020 16:27:38 +0000
Subject: [PATCH 11/14] Set version to 2.16.17-SNAPSHOT

Change-Id: I0de189351cf696c14127f303bfbdcfcb9efe87c3
---
 tools/maven/gerrit-acceptance-framework_pom.xml | 2 +-
 tools/maven/gerrit-extension-api_pom.xml        | 2 +-
 tools/maven/gerrit-plugin-api_pom.xml           | 2 +-
 tools/maven/gerrit-plugin-gwtui_pom.xml         | 2 +-
 tools/maven/gerrit-war_pom.xml                  | 2 +-
 version.bzl                                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/maven/gerrit-acceptance-framework_pom.xml b/tools/maven/gerrit-acceptance-framework_pom.xml
index f0a50d5fb5..341d5a93eb 100644
--- a/tools/maven/gerrit-acceptance-framework_pom.xml
+++ b/tools/maven/gerrit-acceptance-framework_pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-acceptance-framework</artifactId>
-  <version>2.16.16</version>
+  <version>2.16.17-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Gerrit Code Review - Acceptance Test Framework</name>
   <description>Framework for Gerrit's acceptance tests</description>
diff --git a/tools/maven/gerrit-extension-api_pom.xml b/tools/maven/gerrit-extension-api_pom.xml
index b6cbbea816..ffb015814e 100644
--- a/tools/maven/gerrit-extension-api_pom.xml
+++ b/tools/maven/gerrit-extension-api_pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-extension-api</artifactId>
-  <version>2.16.16</version>
+  <version>2.16.17-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Gerrit Code Review - Extension API</name>
   <description>API for Gerrit Extensions</description>
diff --git a/tools/maven/gerrit-plugin-api_pom.xml b/tools/maven/gerrit-plugin-api_pom.xml
index 71783a82b1..89a0855d0e 100644
--- a/tools/maven/gerrit-plugin-api_pom.xml
+++ b/tools/maven/gerrit-plugin-api_pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-plugin-api</artifactId>
-  <version>2.16.16</version>
+  <version>2.16.17-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Gerrit Code Review - Plugin API</name>
   <description>API for Gerrit Plugins</description>
diff --git a/tools/maven/gerrit-plugin-gwtui_pom.xml b/tools/maven/gerrit-plugin-gwtui_pom.xml
index 602c62a230..8867410564 100644
--- a/tools/maven/gerrit-plugin-gwtui_pom.xml
+++ b/tools/maven/gerrit-plugin-gwtui_pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-plugin-gwtui</artifactId>
-  <version>2.16.16</version>
+  <version>2.16.17-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Gerrit Code Review - Plugin GWT UI</name>
   <description>Common Classes for Gerrit GWT UI Plugins</description>
diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml
index 1ce8347118..d21e9e4ab0 100644
--- a/tools/maven/gerrit-war_pom.xml
+++ b/tools/maven/gerrit-war_pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.gerrit</groupId>
   <artifactId>gerrit-war</artifactId>
-  <version>2.16.16</version>
+  <version>2.16.17-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>Gerrit Code Review - WAR</name>
   <description>Gerrit WAR</description>
diff --git a/version.bzl b/version.bzl
index 8603b4fa85..df79f8366d 100644
--- a/version.bzl
+++ b/version.bzl
@@ -2,4 +2,4 @@
 # Used by :api_install and :api_deploy targets
 # when talking to the destination repository.
 #
-GERRIT_VERSION = "2.16.16"
+GERRIT_VERSION = "2.16.17-SNAPSHOT"

From 47d74d21738ccf45b2071b1fd1c7862386b47a4e Mon Sep 17 00:00:00 2001
From: Changcheng Xiao <xchangcheng@google.com>
Date: Thu, 14 Feb 2019 18:03:28 +0100
Subject: [PATCH 12/14] PatchSetInserter: allow to set "sendEmail" bit

With this new "sendEmail" bit, we will have more control
for whether emails are going to be sent out after a new
patch set is added. This is useful for avoiding duplicate
emails, e.g merge (already have an email to notify a change
is merged, no need to have another email to say a new patch
set is uploaded).

Change-Id: I43c5d7c6560316d5a6034dc8e711f7e87b7af932
---
 .../google/gerrit/server/change/PatchSetInserter.java    | 8 +++++++-
 java/com/google/gerrit/server/change/RebaseChangeOp.java | 9 ++++++++-
 .../gerrit/server/submit/RebaseSubmitStrategy.java       | 1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/java/com/google/gerrit/server/change/PatchSetInserter.java b/java/com/google/gerrit/server/change/PatchSetInserter.java
index 24c4237ae3..fc2167f08a 100644
--- a/java/com/google/gerrit/server/change/PatchSetInserter.java
+++ b/java/com/google/gerrit/server/change/PatchSetInserter.java
@@ -102,6 +102,7 @@ public class PatchSetInserter implements BatchUpdateOp {
   private ListMultimap<RecipientType, Account.Id> accountsToNotify = ImmutableListMultimap.of();
   private boolean allowClosed;
   private boolean copyApprovals = true;
+  private boolean sendEmail = true;
 
   // Fields set during some phase of BatchUpdate.Op.
   private Change change;
@@ -197,6 +198,11 @@ public class PatchSetInserter implements BatchUpdateOp {
     return this;
   }
 
+  public PatchSetInserter setSendEmail(boolean sendEmail) {
+    this.sendEmail = sendEmail;
+    return this;
+  }
+
   public Change getChange() {
     checkState(change != null, "getChange() only valid after executing update");
     return change;
@@ -282,7 +288,7 @@ public class PatchSetInserter implements BatchUpdateOp {
 
   @Override
   public void postUpdate(Context ctx) throws OrmException {
-    if (notify != NotifyHandling.NONE || !accountsToNotify.isEmpty()) {
+    if (sendEmail && (notify != NotifyHandling.NONE || !accountsToNotify.isEmpty())) {
       try {
         ReplacePatchSetSender cm = replacePatchSetFactory.create(ctx.getProject(), change.getId());
         cm.setFrom(ctx.getAccountId());
diff --git a/java/com/google/gerrit/server/change/RebaseChangeOp.java b/java/com/google/gerrit/server/change/RebaseChangeOp.java
index 1f216f0a71..f48ea57d5d 100644
--- a/java/com/google/gerrit/server/change/RebaseChangeOp.java
+++ b/java/com/google/gerrit/server/change/RebaseChangeOp.java
@@ -72,6 +72,7 @@ public class RebaseChangeOp implements BatchUpdateOp {
   private boolean copyApprovals = true;
   private boolean detailedCommitMessage;
   private boolean postMessage = true;
+  private boolean sendEmail = true;
   private boolean matchAuthorToCommitterDate = false;
 
   private RevCommit rebasedCommit;
@@ -141,6 +142,11 @@ public class RebaseChangeOp implements BatchUpdateOp {
     return this;
   }
 
+  public RebaseChangeOp setSendEmail(boolean sendEmail) {
+    this.sendEmail = sendEmail;
+    return this;
+  }
+
   public RebaseChangeOp setMatchAuthorToCommitterDate(boolean matchAuthorToCommitterDate) {
     this.matchAuthorToCommitterDate = matchAuthorToCommitterDate;
     return this;
@@ -189,7 +195,8 @@ public class RebaseChangeOp implements BatchUpdateOp {
             .setFireRevisionCreated(fireRevisionCreated)
             .setCopyApprovals(copyApprovals)
             .setCheckAddPatchSetPermission(checkAddPatchSetPermission)
-            .setValidate(validate);
+            .setValidate(validate)
+            .setSendEmail(sendEmail);
     if (postMessage) {
       patchSetInserter.setMessage(
           "Patch Set "
diff --git a/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java b/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java
index 1ec7ca853a..d59ce68c15 100644
--- a/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java
+++ b/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java
@@ -187,6 +187,7 @@ public class RebaseSubmitStrategy extends SubmitStrategy {
                 // Do not post message after inserting new patchset because there
                 // will be one about change being merged already.
                 .setPostMessage(false)
+                .setSendEmail(false)
                 .setMatchAuthorToCommitterDate(
                     args.project.is(BooleanProjectConfig.MATCH_AUTHOR_TO_COMMITTER_DATE));
         try {

From b88351bc938cad7e4b9548e7141bbc4e3be09603 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Wed, 22 Jan 2020 23:08:43 +0100
Subject: [PATCH 13/14] Don't send mails on publish change edits for WIP
 changes

Bug: Issue 10397
Change-Id: I6b6710d17138f277ac118924355311d192710f5c
---
 java/com/google/gerrit/server/edit/ChangeEditUtil.java    | 3 ++-
 .../com/google/gerrit/acceptance/edit/ChangeEditIT.java   | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/java/com/google/gerrit/server/edit/ChangeEditUtil.java b/java/com/google/gerrit/server/edit/ChangeEditUtil.java
index d5add76be1..39cf44f255 100644
--- a/java/com/google/gerrit/server/edit/ChangeEditUtil.java
+++ b/java/com/google/gerrit/server/edit/ChangeEditUtil.java
@@ -182,7 +182,8 @@ public class ChangeEditUtil {
           patchSetInserterFactory
               .create(notes, psId, squashed)
               .setNotify(notify)
-              .setAccountsToNotify(accountsToNotify);
+              .setAccountsToNotify(accountsToNotify)
+              .setSendEmail(!change.isWorkInProgress());
 
       StringBuilder message =
           new StringBuilder("Patch Set ").append(inserter.getPatchSetId().get()).append(": ");
diff --git a/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java b/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java
index 7573a09944..47f4a8f01b 100644
--- a/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java
+++ b/javatests/com/google/gerrit/acceptance/edit/ChangeEditIT.java
@@ -156,8 +156,11 @@ public class ChangeEditIT extends AbstractDaemonTest {
   public void publishEdit() throws Exception {
     createArbitraryEditFor(changeId);
 
+    AddReviewerInput in = new AddReviewerInput();
+    in.reviewer = user.email;
+    gApi.changes().id(changeId).addReviewer(in);
+
     PublishChangeEditInput publishInput = new PublishChangeEditInput();
-    publishInput.notify = NotifyHandling.NONE;
     gApi.changes().id(changeId).edit().publish(publishInput);
 
     assertThat(getEdit(changeId)).isAbsent();
@@ -174,8 +177,10 @@ public class ChangeEditIT extends AbstractDaemonTest {
     assertThat(info.messages).isNotEmpty();
     assertThat(Iterables.getLast(info.messages).tag)
         .isEqualTo(ChangeMessagesUtil.TAG_UPLOADED_PATCH_SET);
+    assertThat(sender.getMessages()).isNotEmpty();
 
     // Move the change to WIP, repeat, and verify.
+    sender.clear();
     gApi.changes().id(changeId).setWorkInProgress();
     createEmptyEditFor(changeId);
     gApi.changes().id(changeId).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW2));
@@ -184,6 +189,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
     assertThat(info.messages).isNotEmpty();
     assertThat(Iterables.getLast(info.messages).tag)
         .isEqualTo(ChangeMessagesUtil.TAG_UPLOADED_WIP_PATCH_SET);
+    assertThat(sender.getMessages()).isEmpty();
   }
 
   @Test

From 5edf70ec116809366f401b11e6d2f595aafe55d3 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Tue, 4 Feb 2020 22:57:14 +0100
Subject: [PATCH 14/14] Fix method name to register custom event types in
 plugins

Change-Id: I6dd2035de403e3d6ce1d7c78634a3a0ffd8feff1
---
 Documentation/dev-plugins.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt
index 64cae2d5a6..a80b4b55f3 100644
--- a/Documentation/dev-plugins.txt
+++ b/Documentation/dev-plugins.txt
@@ -474,9 +474,9 @@ class MyPlugin {
 ----
 
 Plugins which define new Events should register them via the
-`com.google.gerrit.server.events.EventTypes.registerClass()`
-method. This will make the EventType known to the system.
-Deserializing events with the
+`com.google.gerrit.server.events.EventTypes.register()` method.
+This will make the EventType known to the system. Deserializing
+events with the
 `com.google.gerrit.server.events.EventDeserializer` class requires
 that the event be registered in EventTypes.