Remove redundant 'this.' prefix on calls to projectOperations
Change-Id: I6227598e33a5b948e16ada534a05be57d2ef7552
diff --git a/javatests/com/google/gerrit/acceptance/api/project/SetParentIT.java b/javatests/com/google/gerrit/acceptance/api/project/SetParentIT.java
index 35dc929..c21798c 100644
--- a/javatests/com/google/gerrit/acceptance/api/project/SetParentIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/project/SetParentIT.java
@@ -38,7 +38,7 @@
@Test
public void setParentNotAllowed() throws Exception {
- String parent = this.projectOperations.newProject().create().get();
+ String parent = projectOperations.newProject().create().get();
setApiUser(user);
exception.expect(AuthException.class);
gApi.projects().name(project.get()).parent(parent);
@@ -47,7 +47,7 @@
@Test
@GerritConfig(name = "receive.allowProjectOwnersToChangeParent", value = "true")
public void setParentNotAllowedForNonOwners() throws Exception {
- String parent = this.projectOperations.newProject().create().get();
+ String parent = projectOperations.newProject().create().get();
setApiUser(user);
exception.expect(AuthException.class);
gApi.projects().name(project.get()).parent(parent);
@@ -56,7 +56,7 @@
@Test
@GerritConfig(name = "receive.allowProjectOwnersToChangeParent", value = "true")
public void setParentAllowedByAdminWhenAllowProjectOwnersEnabled() throws Exception {
- String parent = this.projectOperations.newProject().create().get();
+ String parent = projectOperations.newProject().create().get();
gApi.projects().name(project.get()).parent(parent);
assertThat(gApi.projects().name(project.get()).parent()).isEqualTo(parent);
@@ -71,7 +71,7 @@
@Test
@GerritConfig(name = "receive.allowProjectOwnersToChangeParent", value = "true")
public void setParentAllowedForOwners() throws Exception {
- String parent = this.projectOperations.newProject().create().get();
+ String parent = projectOperations.newProject().create().get();
setApiUser(user);
grant(project, "refs/*", Permission.OWNER, false, SystemGroupBackend.REGISTERED_USERS);
gApi.projects().name(project.get()).parent(parent);
@@ -80,7 +80,7 @@
@Test
public void setParent() throws Exception {
- String parent = this.projectOperations.newProject().create().get();
+ String parent = projectOperations.newProject().create().get();
gApi.projects().name(project.get()).parent(parent);
assertThat(gApi.projects().name(project.get()).parent()).isEqualTo(parent);
@@ -116,8 +116,8 @@
@Test
public void setParentToGrandchildNotAllowed() throws Exception {
- Project.NameKey child = this.projectOperations.newProject().parent(project).create();
- String grandchild = this.projectOperations.newProject().parent(child).create().get();
+ Project.NameKey child = projectOperations.newProject().parent(project).create();
+ String grandchild = projectOperations.newProject().parent(child).create().get();
exception.expect(ResourceConflictException.class);
exception.expectMessage("cycle exists between");
gApi.projects().name(project.get()).parent(grandchild);
@@ -141,7 +141,7 @@
public void setParentForAllUsersMustBeAllProjects() throws Exception {
gApi.projects().name(allUsers.get()).parent(allProjects.get());
- String parent = this.projectOperations.newProject().create().get();
+ String parent = projectOperations.newProject().create().get();
exception.expect(BadRequestException.class);
exception.expectMessage("All-Users must inherit from All-Projects");
diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractSubmoduleSubscription.java b/javatests/com/google/gerrit/acceptance/git/AbstractSubmoduleSubscription.java
index 242422e..58051bb 100644
--- a/javatests/com/google/gerrit/acceptance/git/AbstractSubmoduleSubscription.java
+++ b/javatests/com/google/gerrit/acceptance/git/AbstractSubmoduleSubscription.java
@@ -109,7 +109,7 @@
}
protected Project.NameKey createProjectForPush(SubmitType submitType) throws Exception {
- Project.NameKey project = this.projectOperations.newProject().submitType(submitType).create();
+ Project.NameKey project = projectOperations.newProject().submitType(submitType).create();
grantPush(project);
return project;
}
diff --git a/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsIT.java b/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsIT.java
index 0ff9adb..72ba420 100644
--- a/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsIT.java
+++ b/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsIT.java
@@ -403,8 +403,7 @@
@Test
public void subscriptionInheritACL() throws Exception {
- Project.NameKey configKey =
- this.projectOperations.newProject().submitType(getSubmitType()).create();
+ Project.NameKey configKey = projectOperations.newProject().submitType(getSubmitType()).create();
grantPush(configKey);
Project.NameKey config2Key =
projectOperations.newProject().parent(configKey).submitType(getSubmitType()).create();
diff --git a/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java b/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java
index 81a2ba5..82b9cd0 100644
--- a/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java
+++ b/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java
@@ -364,14 +364,14 @@
public void doNotUseFastForward() throws Exception {
// like setup, but without empty commit
superKey =
- this.projectOperations
+ projectOperations
.newProject()
.submitType(getSubmitType())
.createEmptyCommit(false)
.create();
grantPush(superKey);
subKey =
- this.projectOperations
+ projectOperations
.newProject()
.submitType(getSubmitType())
.createEmptyCommit(false)
@@ -404,14 +404,14 @@
public void useFastForwardWhenNoSubmodule() throws Exception {
// like setup, but without empty commit
superKey =
- this.projectOperations
+ projectOperations
.newProject()
.submitType(getSubmitType())
.createEmptyCommit(false)
.create();
grantPush(superKey);
subKey =
- this.projectOperations
+ projectOperations
.newProject()
.submitType(getSubmitType())
.createEmptyCommit(false)
diff --git a/javatests/com/google/gerrit/acceptance/rest/account/WatchedProjectsIT.java b/javatests/com/google/gerrit/acceptance/rest/account/WatchedProjectsIT.java
index ae0483b..f9bc539 100644
--- a/javatests/com/google/gerrit/acceptance/rest/account/WatchedProjectsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/account/WatchedProjectsIT.java
@@ -61,8 +61,8 @@
@Test
public void setAndDeleteWatchedProjects() throws Exception {
- String projectName1 = this.projectOperations.newProject().create().get();
- String projectName2 = this.projectOperations.newProject().create().get();
+ String projectName1 = projectOperations.newProject().create().get();
+ String projectName2 = projectOperations.newProject().create().get();
List<ProjectWatchInfo> projectsToWatch = new ArrayList<>();
@@ -95,7 +95,7 @@
@Test
public void setConflictingWatches() throws Exception {
- String projectName = this.projectOperations.newProject().create().get();
+ String projectName = projectOperations.newProject().create().get();
List<ProjectWatchInfo> projectsToWatch = new ArrayList<>();
@@ -119,7 +119,7 @@
@Test
public void setAndGetEmptyWatch() throws Exception {
- String projectName = this.projectOperations.newProject().create().get();
+ String projectName = projectOperations.newProject().create().get();
List<ProjectWatchInfo> projectsToWatch = new ArrayList<>();
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/PrivateByDefaultIT.java b/javatests/com/google/gerrit/acceptance/rest/change/PrivateByDefaultIT.java
index 27596c5..936feed 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/PrivateByDefaultIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/PrivateByDefaultIT.java
@@ -41,7 +41,7 @@
@Before
public void setUp() throws Exception {
project1 = projectOperations.newProject().create();
- project2 = this.projectOperations.newProject().parent(project1).create();
+ project2 = projectOperations.newProject().parent(project1).create();
setPrivateByDefault(project1, InheritableBoolean.FALSE);
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java
index 13e7642e..d92cf30 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java
@@ -135,9 +135,9 @@
@Test
public void submitChangesAcrossRepos() throws Exception {
- Project.NameKey p1 = this.projectOperations.newProject().create();
- Project.NameKey p2 = this.projectOperations.newProject().create();
- Project.NameKey p3 = this.projectOperations.newProject().create();
+ Project.NameKey p1 = projectOperations.newProject().create();
+ Project.NameKey p2 = projectOperations.newProject().create();
+ Project.NameKey p3 = projectOperations.newProject().create();
RevCommit initialHead2 = getRemoteHead(p2, "master");
RevCommit initialHead3 = getRemoteHead(p3, "master");
@@ -212,9 +212,9 @@
@Test
public void submitChangesAcrossReposBlocked() throws Exception {
- Project.NameKey p1 = this.projectOperations.newProject().create();
- Project.NameKey p2 = this.projectOperations.newProject().create();
- Project.NameKey p3 = this.projectOperations.newProject().create();
+ Project.NameKey p1 = projectOperations.newProject().create();
+ Project.NameKey p2 = projectOperations.newProject().create();
+ Project.NameKey p3 = projectOperations.newProject().create();
TestRepository<?> repo1 = cloneProject(p1);
TestRepository<?> repo2 = cloneProject(p2);
@@ -391,7 +391,7 @@
"3",
"a-topic-here");
- Project.NameKey p3 = this.projectOperations.newProject().create();
+ Project.NameKey p3 = projectOperations.newProject().create();
TestRepository<?> repo3 = cloneProject(p3);
RevCommit repo3Head = getRemoteHead(p3, "master");
PushOneCommit.Result change3b =
@@ -713,8 +713,8 @@
// (c2a) <= private
assume().that(isSubmitWholeTopicEnabled()).isTrue();
- Project.NameKey p1 = this.projectOperations.newProject().create();
- Project.NameKey p2 = this.projectOperations.newProject().create();
+ Project.NameKey p1 = projectOperations.newProject().create();
+ Project.NameKey p2 = projectOperations.newProject().create();
grantLabel("Code-Review", -2, 2, p1, "refs/heads/*", false, REGISTERED_USERS, false);
grant(p1, "refs/*", Permission.SUBMIT, false, REGISTERED_USERS);
@@ -767,7 +767,7 @@
@Test
public void testPreviewSubmitTgz() throws Exception {
- Project.NameKey p1 = this.projectOperations.newProject().create();
+ Project.NameKey p1 = projectOperations.newProject().create();
TestRepository<?> repo1 = cloneProject(p1);
PushOneCommit.Result change1 = createChange(repo1, "master", "test", "a.txt", "1", "topic");
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/GetChildProjectIT.java b/javatests/com/google/gerrit/acceptance/rest/project/GetChildProjectIT.java
index 1055131..d736578 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/GetChildProjectIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/GetChildProjectIT.java
@@ -53,7 +53,7 @@
@Test
public void getGrandChildProject_NotFound() throws Exception {
Project.NameKey child = projectOperations.newProject().create();
- Project.NameKey grandChild = this.projectOperations.newProject().parent(child).create();
+ Project.NameKey grandChild = projectOperations.newProject().parent(child).create();
assertChildNotFound(allProjects, grandChild.get());
}
@@ -61,7 +61,7 @@
@Test
public void getGrandChildProjectWithRecursiveFlag() throws Exception {
Project.NameKey child = projectOperations.newProject().create();
- Project.NameKey grandChild = this.projectOperations.newProject().parent(child).create();
+ Project.NameKey grandChild = projectOperations.newProject().parent(child).create();
ProjectInfo grandChildInfo =
gApi.projects().name(allProjects.get()).child(grandChild.get()).get(true);
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/ListChildProjectsIT.java b/javatests/com/google/gerrit/acceptance/rest/project/ListChildProjectsIT.java
index c1d19b8..a0bc450 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/ListChildProjectsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/ListChildProjectsIT.java
@@ -44,8 +44,8 @@
@Test
public void listChildren() throws Exception {
Project.NameKey child1 = projectOperations.newProject().create();
- Project.NameKey child1_1 = this.projectOperations.newProject().parent(child1).create();
- Project.NameKey child1_2 = this.projectOperations.newProject().parent(child1).create();
+ Project.NameKey child1_1 = projectOperations.newProject().parent(child1).create();
+ Project.NameKey child1_2 = projectOperations.newProject().parent(child1).create();
assertThatNameList(gApi.projects().name(child1.get()).children()).isOrdered();
assertThatNameList(gApi.projects().name(child1.get()).children())
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java b/javatests/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java
index 08ff946..7009e76 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java
@@ -46,7 +46,7 @@
@Test
public void listProjects() throws Exception {
- Project.NameKey someProject = this.projectOperations.newProject().create();
+ Project.NameKey someProject = projectOperations.newProject().create();
assertThatNameList(gApi.projects().list().get())
.containsExactly(allProjects, allUsers, project, someProject);
assertThatNameList(gApi.projects().list().get()).isOrdered();
@@ -196,8 +196,8 @@
@Test
public void listWithHiddenAndReadonlyProjects() throws Exception {
- Project.NameKey hidden = this.projectOperations.newProject().create();
- Project.NameKey readonly = this.projectOperations.newProject().create();
+ Project.NameKey hidden = projectOperations.newProject().create();
+ Project.NameKey readonly = projectOperations.newProject().create();
// Set project read-only
ConfigInput input = new ConfigInput();
diff --git a/javatests/com/google/gerrit/acceptance/server/permissions/PermissionBackendConditionIT.java b/javatests/com/google/gerrit/acceptance/server/permissions/PermissionBackendConditionIT.java
index 2028a68..a72cd33 100644
--- a/javatests/com/google/gerrit/acceptance/server/permissions/PermissionBackendConditionIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/permissions/PermissionBackendConditionIT.java
@@ -154,8 +154,7 @@
@Test
public void refPermissions_differentResourceAndSameUserDoesNotEqual2() throws Exception {
Branch.NameKey branch1 = new Branch.NameKey(project, "branch");
- Branch.NameKey branch2 =
- new Branch.NameKey(this.projectOperations.newProject().create(), "branch");
+ Branch.NameKey branch2 = new Branch.NameKey(projectOperations.newProject().create(), "branch");
BooleanCondition cond1 = pb.user(user()).ref(branch1).testCond(RefPermission.READ);
BooleanCondition cond2 = pb.user(user()).ref(branch2).testCond(RefPermission.READ);
