opendev/gerrit
Code Issues Proposed changes

Move RegexListSearcher out of giant server library into ioutil

Browse Source 
Change-Id: I984dc32a38c4bb75e5f25764caebe3c4b072b293
This commit is contained in:
Han-Wen Nienhuys
2018-07-06 15:22:22 +02:00
parent 75aa75a39c
commit f67bc12ea3
6 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/com/google/gerrit/server/ioutil/BUILD
View File

@@ -4,6 +4,7 @@ java_library(
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit/reviewdb:client",
"//lib:automaton",
"//lib:guava",
"//lib/jgit/org.eclipse.jgit.archive:jgit-archive",
"//lib/jgit/org.eclipse.jgit:jgit",

4
java/com/google/gerrit/server/util/RegexListSearcher.java → java/com/google/gerrit/server/ioutil/RegexListSearcher.java
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2014 The Android Open Source Project
// Copyright (C) 2018 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.
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.util;
package com.google.gerrit.server.ioutil;
import static com.google.common.base.Preconditions.checkNotNull;

2
java/com/google/gerrit/server/query/change/RegexPathPredicate.java
View File

@@ -15,7 +15,7 @@
package com.google.gerrit.server.query.change;
import com.google.gerrit.server.index.change.ChangeField;
import com.google.gerrit.server.util.RegexListSearcher;
import com.google.gerrit.server.ioutil.RegexListSearcher;
import com.google.gwtorm.server.OrmException;
import java.io.IOException;
import java.util.List;

2
java/com/google/gerrit/server/restapi/project/ListProjects.java
View File

@@ -42,6 +42,7 @@ import com.google.gerrit.server.OutputFormat;
import com.google.gerrit.server.WebLinks;
import com.google.gerrit.server.account.GroupControl;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.ioutil.RegexListSearcher;
import com.google.gerrit.server.ioutil.StringUtil;
import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.permissions.PermissionBackendException;
@@ -50,7 +51,6 @@ import com.google.gerrit.server.permissions.RefPermission;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.restapi.group.GroupsCollection;
import com.google.gerrit.server.util.RegexListSearcher;
import com.google.gerrit.server.util.TreeFormatter;
import com.google.gson.reflect.TypeToken;
import com.google.inject.Inject;

3
javatests/com/google/gerrit/server/ioutil/BUILD
View File

@@ -10,5 +10,8 @@ junit_tests(
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit/server/ioutil",
"//lib:guava",
"//lib/truth",
"//lib/truth:truth-java8-extension",
],
)

4
javatests/com/google/gerrit/server/util/RegexListSearcherTest.java → javatests/com/google/gerrit/server/ioutil/RegexListSearcherTest.java
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2014 The Android Open Source Project
// Copyright (C) 2018 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.
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.util;
package com.google.gerrit.server.ioutil;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth8.assertThat;