opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.0' into stable-3.1

Browse Source 
* stable-3.0:
  Delete unused download command general preference
  Remove theme preferences
  Remove key_map_type edit preference
  Update description of git_basic_auth_policy field in AuthInfo
  Delete unused GroupDetail and GroupInfo classes
  Delete unused JdbcUtil class
  Schema_181: Fix typo in UI message
  Fix wrong javadoc tags
  Update git submodules
  Documentation: Fix java SDK typo in dev-eclipse.txt
  Upgrade jackson-core to 2.10.2
  Reduce change spamming from CI
  Link checker result to the proper console URL
  Remove unused createCheckPayload() method
  Bazel: Force sourcemaps inlining in polymer bundler

Change-Id: I6b6712173433027f75419bdbab61d74c67e626df
This commit is contained in:
David Pursehouse
2020-01-09 14:12:18 +09:00
parent af85801cd9 24496644c2
commit 852ba25130
22 changed files with 16 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
java/com/google/gerrit/server/schema/JdbcUtil.java
View File

@@ -1,39 +0,0 @@
// Copyright (C) 2012 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.server.schema;
import com.google.gerrit.common.UsedAt;
public class JdbcUtil {
public static String hostname(String hostname) {
if (hostname == null || hostname.isEmpty()) {
hostname = "localhost";
} else if (hostname.contains(":") && !hostname.startsWith("[")) {
hostname = "[" + hostname + "]";
}
return hostname;
}
// TODO(dborowitz): Still used by plugins post-ReviewDb?
@UsedAt(UsedAt.Project.PLUGINS_ALL)
public static String port(String port) {
if (port != null && !port.isEmpty()) {
return ":" + port;
}
return "";
}
}

2
java/com/google/gerrit/server/schema/Schema_181.java
View File

@@ -20,7 +20,7 @@ import org.eclipse.jgit.lib.Repository;
public class Schema_181 implements NoteDbSchemaVersion {
@Override
public void upgrade(Arguments args, UpdateUI ui) throws Exception {
ui.message("Rebuild GPGP note map to build subkey to master key map");
ui.message("Rebuild GPG note map to build subkey to master key map");
try (Repository repo = args.repoManager.openRepository(args.allUsers);
PublicKeyStore store = new PublicKeyStore(repo)) {
store.rebuildSubkeyMasterKeyMap();