commit 218ec1f206c7980b0f859506eacddb9b0ca03e08
author Dave Borowitz <dborowitz@google.com> Mon Apr 02 11:39:16 2018 -0400
committer Dave Borowitz <dborowitz@google.com> Tue Apr 03 12:29:33 2018 -0400
tree fda03f7196aad3d63d9666c45c81f7e6d78d45d0
parent 087a14207fa8eb58d9995916fce640bc9415a09c

Move QueryList to account package

Only keep public the one method that is used outside the package.

Change-Id: Ia2faa7fe65b8f593fbf028a898f8694fd69380b1

java/com/google/gerrit/server/account/QueryList.java

diff --git a/java/com/google/gerrit/server/git/QueryList.java b/java/com/google/gerrit/server/account/QueryList.java
similarity index 85%
rename from java/com/google/gerrit/server/git/QueryList.java
rename to java/com/google/gerrit/server/account/QueryList.java
index 6ca8b5a..0838e99 100644
--- a/java/com/google/gerrit/server/git/QueryList.java
+++ b/java/com/google/gerrit/server/account/QueryList.java
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.server.git;
+package com.google.gerrit.server.account;
 
+import com.google.gerrit.server.git.ValidationError;
 import com.google.gerrit.server.git.meta.TabFile;
 import java.io.IOException;
 import java.util.List;
@@ -27,7 +28,7 @@
     this.queriesByName = toMap(queriesByName);
   }
 
-  public static QueryList parse(String text, ValidationError.Sink errors) throws IOException {
+  static QueryList parse(String text, ValidationError.Sink errors) throws IOException {
     return new QueryList(parse(text, FILE_NAME, TRIM, TRIM, errors));
   }
 
@@ -35,7 +36,7 @@
     return queriesByName.get(name);
   }
 
-  public String asText() {
+  String asText() {
     return asText("Name", "Query", queriesByName);
   }
 }

java/com/google/gerrit/server/account/VersionedAccountQueries.java

diff --git a/java/com/google/gerrit/server/account/VersionedAccountQueries.java b/java/com/google/gerrit/server/account/VersionedAccountQueries.java
index 29affb3..b43a65d 100644
--- a/java/com/google/gerrit/server/account/VersionedAccountQueries.java
+++ b/java/com/google/gerrit/server/account/VersionedAccountQueries.java
@@ -16,7 +16,6 @@
 
 import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.reviewdb.client.RefNames;
-import com.google.gerrit.server.git.QueryList;
 import com.google.gerrit.server.git.meta.VersionedMetaData;
 import java.io.IOException;
 import org.eclipse.jgit.errors.ConfigInvalidException;

javatests/com/google/gerrit/server/account/QueryListTest.java

diff --git a/javatests/com/google/gerrit/server/git/QueryListTest.java b/javatests/com/google/gerrit/server/account/QueryListTest.java
similarity index 97%
rename from javatests/com/google/gerrit/server/git/QueryListTest.java
rename to javatests/com/google/gerrit/server/account/QueryListTest.java
index 8d0f909..2792de8 100644
--- a/javatests/com/google/gerrit/server/git/QueryListTest.java
+++ b/javatests/com/google/gerrit/server/account/QueryListTest.java
@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.server.git;
+package com.google.gerrit.server.account;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.easymock.EasyMock.createNiceMock;
 import static org.easymock.EasyMock.replay;
 
+import com.google.gerrit.server.git.ValidationError;
 import java.io.IOException;
 import junit.framework.TestCase;
 import org.junit.Test;