opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.1'

Browse Source 
* stable-3.1:
  Documentation: Fix word typo in Eclipse Setup page
  Update elasticsearch-rest-client to 7.4.2
  GetAccess: Access MetaDataUpdate.Factory via Provider
  ElasticContainer: Use 6.8.4 image for V6_8 tests
  SetParent: Access MetaDataUpdate.Factory via Provider
  PutDescription: Access MetaDataUpdate.Factory via Provider

Change-Id: I1523e9dec1fd0175bc6594f01e041de9fe2632d8
This commit is contained in:
Marco Miller
2019-11-01 20:35:17 -04:00
parent 8e700b02c7 424b0ebc90
commit a27c66b3ca
6 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/dev-eclipse.txt
View File

@@ -53,7 +53,7 @@ Java 9 and later are supported, but some adjustments must be done, because
Java 8 is still the default: Java 8 is still the default:
* Add JRE, e.g.: directory: /usr/lib64/jvm/java-9-openjdk, name: java-9-openjdk-9 * Add JRE, e.g.: directory: /usr/lib64/jvm/java-9-openjdk, name: java-9-openjdk-9
* Change execution environemnt for gerrit project to: JavaSE-9 (java-9-openjdk-9) * Change execution environment for gerrit project to: JavaSE-9 (java-9-openjdk-9)
* Check that compiler compliance level in gerrit project is set to: 9 * Check that compiler compliance level in gerrit project is set to: 9
[[Formatting]] [[Formatting]]

4
WORKSPACE
View File

@@ -1018,8 +1018,8 @@ maven_jar(
# and httpasyncclient as necessary. # and httpasyncclient as necessary.
maven_jar( maven_jar(
name = "elasticsearch-rest-client", name = "elasticsearch-rest-client",
artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.1", artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.4.2",
sha1 = "b4e00ab47019103d69b6c9dcfdcbd3bfda00f86e", sha1 = "f48725523c0b3402f869214433602f8d3f4c737c",
) )
maven_jar( maven_jar(

6
java/com/google/gerrit/server/restapi/project/GetAccess.java
View File

@@ -90,7 +90,7 @@ public class GetAccess implements RestReadView<ProjectResource> {
private final AllProjectsName allProjectsName; private final AllProjectsName allProjectsName;
private final ProjectJson projectJson; private final ProjectJson projectJson;
private final ProjectCache projectCache; private final ProjectCache projectCache;
private final MetaDataUpdate.Server metaDataUpdateFactory; private final Provider<MetaDataUpdate.Server> metaDataUpdateFactory;
private final GroupBackend groupBackend; private final GroupBackend groupBackend;
private final WebLinks webLinks; private final WebLinks webLinks;
private final ProjectConfig.Factory projectConfigFactory; private final ProjectConfig.Factory projectConfigFactory;
@@ -101,7 +101,7 @@ public class GetAccess implements RestReadView<ProjectResource> {
PermissionBackend permissionBackend, PermissionBackend permissionBackend,
AllProjectsName allProjectsName, AllProjectsName allProjectsName,
ProjectCache projectCache, ProjectCache projectCache,
MetaDataUpdate.Server metaDataUpdateFactory, Provider<MetaDataUpdate.Server> metaDataUpdateFactory,
ProjectJson projectJson, ProjectJson projectJson,
GroupBackend groupBackend, GroupBackend groupBackend,
WebLinks webLinks, WebLinks webLinks,
@@ -139,7 +139,7 @@ public class GetAccess implements RestReadView<ProjectResource> {
PermissionBackend.ForProject perm = permissionBackend.currentUser().project(projectName); PermissionBackend.ForProject perm = permissionBackend.currentUser().project(projectName);
ProjectConfig config; ProjectConfig config;
try (MetaDataUpdate md = metaDataUpdateFactory.create(projectName)) { try (MetaDataUpdate md = metaDataUpdateFactory.get().create(projectName)) {
config = projectConfigFactory.read(md); config = projectConfigFactory.read(md);
info.configWebLinks = new ArrayList<>(); info.configWebLinks = new ArrayList<>();

7
java/com/google/gerrit/server/restapi/project/PutDescription.java
View File

@@ -32,6 +32,7 @@ import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectConfig; import com.google.gerrit.server.project.ProjectConfig;
import com.google.gerrit.server.project.ProjectResource; import com.google.gerrit.server.project.ProjectResource;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import java.io.IOException; import java.io.IOException;
import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.ConfigInvalidException;
@@ -40,14 +41,14 @@ import org.eclipse.jgit.errors.RepositoryNotFoundException;
@Singleton @Singleton
public class PutDescription implements RestModifyView<ProjectResource, DescriptionInput> { public class PutDescription implements RestModifyView<ProjectResource, DescriptionInput> {
private final ProjectCache cache; private final ProjectCache cache;
private final MetaDataUpdate.Server updateFactory; private final Provider<MetaDataUpdate.Server> updateFactory;
private final PermissionBackend permissionBackend; private final PermissionBackend permissionBackend;
private final ProjectConfig.Factory projectConfigFactory; private final ProjectConfig.Factory projectConfigFactory;
@Inject @Inject
PutDescription( PutDescription(
ProjectCache cache, ProjectCache cache,
MetaDataUpdate.Server updateFactory, Provider<MetaDataUpdate.Server> updateFactory,
PermissionBackend permissionBackend, PermissionBackend permissionBackend,
ProjectConfig.Factory projectConfigFactory) { ProjectConfig.Factory projectConfigFactory) {
this.cache = cache; this.cache = cache;
@@ -70,7 +71,7 @@ public class PutDescription implements RestModifyView<ProjectResource, Descripti
.project(resource.getNameKey()) .project(resource.getNameKey())
.check(ProjectPermission.WRITE_CONFIG); .check(ProjectPermission.WRITE_CONFIG);
try (MetaDataUpdate md = updateFactory.create(resource.getNameKey())) { try (MetaDataUpdate md = updateFactory.get().create(resource.getNameKey())) {
ProjectConfig config = projectConfigFactory.read(md); ProjectConfig config = projectConfigFactory.read(md);
Project project = config.getProject(); Project project = config.getProject();
project.setDescription(Strings.emptyToNull(input.description)); project.setDescription(Strings.emptyToNull(input.description));

7
java/com/google/gerrit/server/restapi/project/SetParent.java
View File

@@ -48,6 +48,7 @@ import com.google.gerrit.server.project.ProjectConfig;
import com.google.gerrit.server.project.ProjectResource; import com.google.gerrit.server.project.ProjectResource;
import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.ProjectState;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import java.io.IOException; import java.io.IOException;
import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.ConfigInvalidException;
@@ -59,7 +60,7 @@ public class SetParent
implements RestModifyView<ProjectResource, ParentInput>, GerritConfigListener { implements RestModifyView<ProjectResource, ParentInput>, GerritConfigListener {
private final ProjectCache cache; private final ProjectCache cache;
private final PermissionBackend permissionBackend; private final PermissionBackend permissionBackend;
private final MetaDataUpdate.Server updateFactory; private final Provider<MetaDataUpdate.Server> updateFactory;
private final AllProjectsName allProjects; private final AllProjectsName allProjects;
private final AllUsersName allUsers; private final AllUsersName allUsers;
private final ProjectConfig.Factory projectConfigFactory; private final ProjectConfig.Factory projectConfigFactory;
@@ -69,7 +70,7 @@ public class SetParent
SetParent( SetParent(
ProjectCache cache, ProjectCache cache,
PermissionBackend permissionBackend, PermissionBackend permissionBackend,
MetaDataUpdate.Server updateFactory, Provider<MetaDataUpdate.Server> updateFactory,
AllProjectsName allProjects, AllProjectsName allProjects,
AllUsersName allUsers, AllUsersName allUsers,
ProjectConfig.Factory projectConfigFactory, ProjectConfig.Factory projectConfigFactory,
@@ -100,7 +101,7 @@ public class SetParent
String parentName = String parentName =
MoreObjects.firstNonNull(Strings.emptyToNull(input.parent), allProjects.get()); MoreObjects.firstNonNull(Strings.emptyToNull(input.parent), allProjects.get());
validateParentUpdate(rsrc.getProjectState().getNameKey(), user, parentName, checkIfAdmin); validateParentUpdate(rsrc.getProjectState().getNameKey(), user, parentName, checkIfAdmin);
try (MetaDataUpdate md = updateFactory.create(rsrc.getNameKey())) { try (MetaDataUpdate md = updateFactory.get().create(rsrc.getNameKey())) {
ProjectConfig config = projectConfigFactory.read(md); ProjectConfig config = projectConfigFactory.read(md);
Project project = config.getProject(); Project project = config.getProject();
project.setParentName(parentName); project.setParentName(parentName);

4
javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
View File

@@ -51,7 +51,7 @@ public class ElasticContainer extends ElasticsearchContainer {
case V6_7: case V6_7:
return "blacktop/elasticsearch:6.7.2"; return "blacktop/elasticsearch:6.7.2";
case V6_8: case V6_8:
return "blacktop/elasticsearch:6.8.2"; return "blacktop/elasticsearch:6.8.4";
case V7_0: case V7_0:
return "blacktop/elasticsearch:7.0.1"; return "blacktop/elasticsearch:7.0.1";
case V7_1: case V7_1:
@@ -61,7 +61,7 @@ public class ElasticContainer extends ElasticsearchContainer {
case V7_3: case V7_3:
return "blacktop/elasticsearch:7.3.2"; return "blacktop/elasticsearch:7.3.2";
case V7_4: case V7_4:
return "blacktop/elasticsearch:7.4.1"; return "blacktop/elasticsearch:7.4.2";
} }
throw new IllegalStateException("No tests for version: " + version.name()); throw new IllegalStateException("No tests for version: " + version.name());
} }