Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  Add CSS style name on review comment div
  Fix incorrect formatting in json documentation
  Don't use deprecated PGPPublicKeyRingCollection constructor
  Add InitStep to fix wrong primary key column order

Change-Id: Id89fc4ec6684396ce13acb57f925fcff53f6b06e

Documentation/json.txt

@@ -149,8 +149,7 @@ was added or last updated.
 by:: Reviewer of the patch set in <<account,account attribute>>.
 
 [[refUpdate]]
-refUpdate
---------
+== refUpdate
 Information about a ref that was updated.
 
 oldRev:: The old value of the ref, prior to the update.

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.ui.xml

@@ -105,6 +105,8 @@ limitations under the License.
     .closed .reply {
       visibility: HIDDEN;
     }
+    .comment {
+    }
   </ui:style>
 
   <g:HTMLPanel
@@ -125,7 +127,8 @@ limitations under the License.
       </g:HTMLPanel>
       <div ui:field='message'
            aria-hidden='true'
-           style='display: NONE'/>
+           style='display: NONE'
+           styleName='{style.comment}'/>
       <g:FlowPanel ui:field='comments' visible='false'/>
     </div>
   </g:HTMLPanel>

gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitModule.java

@@ -48,6 +48,7 @@ public class InitModule extends FactoryModule {
     if (initDb) {
       step().to(InitDatabase.class);
     }
+    step().to(UpdatePrimaryKeys.class);
     step().to(InitIndex.class);
     step().to(InitAuth.class);
     step().to(InitLabels.class);

gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpdatePrimaryKeys.java

@@ -0,0 +1,171 @@
+// 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.pgm.init;
+
+import com.google.common.base.Joiner;
+import com.google.gerrit.pgm.util.ConsoleUI;
+import com.google.gerrit.reviewdb.server.ReviewDb;
+import com.google.gwtorm.jdbc.JdbcExecutor;
+import com.google.gwtorm.jdbc.JdbcSchema;
+import com.google.gwtorm.schema.ColumnModel;
+import com.google.gwtorm.schema.RelationModel;
+import com.google.gwtorm.schema.java.JavaSchemaModel;
+import com.google.gwtorm.schema.sql.DialectPostgreSQL;
+import com.google.gwtorm.schema.sql.SqlDialect;
+import com.google.gwtorm.server.OrmException;
+import com.google.gwtorm.server.SchemaFactory;
+import com.google.gwtorm.server.StatementExecutor;
+import com.google.inject.Inject;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class UpdatePrimaryKeys implements InitStep {
+
+  private final ConsoleUI ui;
+
+  private SchemaFactory<ReviewDb> dbFactory;
+  private ReviewDb db;
+  private Connection conn;
+  private SqlDialect dialect;
+
+  @Inject
+  UpdatePrimaryKeys(ConsoleUI ui) {
+    this.ui = ui;
+  }
+
+  @Override
+  public void run() throws Exception {
+  }
+
+  @Override
+  public void postRun() throws Exception {
+    db = dbFactory.open();
+    try {
+      conn = ((JdbcSchema) db).getConnection();
+      dialect = ((JdbcSchema) db).getDialect();
+      Map<String, List<String>> corrections = findPKUpdates();
+      if (corrections.isEmpty()) {
+        return;
+      }
+
+      ui.header("Wrong Primary Key Column Order Detected");
+      ui.message("The following tables are affected:\n");
+      ui.message("%s\n", Joiner.on(", ").join(corrections.keySet()));
+      if (ui.yesno(true, "Fix primary keys column order")) {
+        ui.message("fixing primary keys...\n");
+        JdbcExecutor executor = new JdbcExecutor(conn);
+        try {
+          for (Map.Entry<String, List<String>> c : corrections.entrySet()) {
+            ui.message("  table: %s ... ", c.getKey());
+            recreatePK(executor, c.getKey(), c.getValue());
+            ui.message("done\n");
+          }
+          ui.message("done\n");
+        } finally {
+          executor.close();
+        }
+      }
+    } finally {
+      db.close();
+    }
+  }
+
+  @Inject(optional = true)
+  void setSchemaFactory(SchemaFactory<ReviewDb> dbFactory) {
+    this.dbFactory = dbFactory;
+  }
+
+  private Map<String, List<String>> findPKUpdates()
+      throws OrmException, SQLException {
+    Map<String, List<String>> corrections = new TreeMap<>();
+    ReviewDb db = dbFactory.open();
+    try {
+      DatabaseMetaData meta = conn.getMetaData();
+      JavaSchemaModel jsm = new JavaSchemaModel(ReviewDb.class);
+      for (RelationModel rm : jsm.getRelations()) {
+        String tableName = rm.getRelationName();
+        List<String> expectedPK = relationPK(rm);
+        List<String> actualPK = dbTablePK(meta, tableName);
+        if (!expectedPK.equals(actualPK)) {
+          corrections.put(tableName, expectedPK);
+        }
+      }
+      return corrections;
+    } finally {
+      db.close();
+    }
+  }
+
+  private List<String> relationPK(RelationModel rm) {
+    Collection<ColumnModel> cols = rm.getPrimaryKeyColumns();
+    List<String> pk = new ArrayList<>(cols.size());
+    for (ColumnModel cm : cols) {
+      pk.add(cm.getColumnName().toLowerCase(Locale.US));
+    }
+    return pk;
+  }
+
+  private List<String> dbTablePK(DatabaseMetaData meta, String tableName)
+      throws SQLException {
+    if (meta.storesUpperCaseIdentifiers()) {
+      tableName = tableName.toUpperCase();
+    } else if (meta.storesLowerCaseIdentifiers()) {
+      tableName = tableName.toLowerCase();
+    }
+
+    ResultSet cols = meta.getPrimaryKeys(null, null, tableName);
+    try {
+      Map<Short, String> seqToName = new TreeMap<>();
+      while (cols.next()) {
+        seqToName.put(cols.getShort("KEY_SEQ"), cols.getString("COLUMN_NAME"));
+      }
+
+      List<String> pk = new ArrayList<>(seqToName.size());
+      for (String name : seqToName.values()) {
+        pk.add(name.toLowerCase(Locale.US));
+      }
+      return pk;
+    } finally {
+      cols.close();
+    }
+  }
+
+  private void recreatePK(StatementExecutor executor, String tableName,
+      List<String> cols) throws OrmException {
+    try {
+      if (dialect instanceof DialectPostgreSQL) {
+        // postgresql doesn't support the ALTER TABLE foo DROP PRIMARY KEY form
+        executor.execute("ALTER TABLE " + tableName + " DROP CONSTRAINT "
+            + tableName + "_pkey");
+      } else {
+        executor.execute("ALTER TABLE " + tableName + " DROP PRIMARY KEY");
+      }
+    } catch (OrmException ignore) {
+      // maybe the primary key was dropped in a previous run but the creation failed
+      ui.message("WARN: %s\n", ignore.getMessage());
+    }
+    executor.execute("ALTER TABLE " + tableName
+        + " ADD PRIMARY KEY(" + Joiner.on(",").join(cols) + ")");
+  }
+}

gerrit-server/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java

@@ -38,6 +38,7 @@ import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
 import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
 import org.bouncycastle.openpgp.PGPUtil;
+import org.bouncycastle.openpgp.bc.BcPGPPublicKeyRingCollection;
 import org.bouncycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder;
 import org.bouncycastle.openpgp.operator.bc.BcPublicKeyKeyEncryptionMethodGenerator;
 import org.slf4j.Logger;
@@ -113,7 +114,7 @@ class EncryptedContactStore implements ContactStore {
   private static PGPPublicKeyRingCollection readPubRing(final File pub) {
     try (InputStream fin = new FileInputStream(pub);
         InputStream in = PGPUtil.getDecoderStream(fin)) {
-        return new PGPPublicKeyRingCollection(in);
+        return new BcPGPPublicKeyRingCollection(in);
     } catch (IOException e) {
       throw new ProvisionException("Cannot read " + pub, e);
     } catch (PGPException e) {