opendev/gerrit
Code Issues Proposed changes

Move DestinationList to account package

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

Change-Id: I5a19a362dd77ac6bd3e129e55c50233a37aec3f1
This commit is contained in:
Dave Borowitz
2018-04-02 11:32:42 -04:00
parent aedd20f243
commit 087a14207f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/com/google/gerrit/server/git/DestinationList.java → java/com/google/gerrit/server/account/DestinationList.java
View File

@@ -12,7 +12,7 @@
// 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.common.collect.Lists;
import com.google.common.collect.MultimapBuilder;
@@ -20,6 +20,7 @@ import com.google.common.collect.SetMultimap;
import com.google.common.collect.Sets;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.git.ValidationError;
import com.google.gerrit.server.git.meta.TabFile;
import java.io.IOException;
import java.util.List;
@@ -34,12 +35,11 @@ public class DestinationList extends TabFile {
return destinations.get(label);
}
public void parseLabel(String label, String text, ValidationError.Sink errors)
throws IOException {
void parseLabel(String label, String text, ValidationError.Sink errors) throws IOException {
destinations.replaceValues(label, toSet(parse(text, DIR_NAME + label, TRIM, null, errors)));
}
public String asText(String label) {
String asText(String label) {
Set<Branch.NameKey> dests = destinations.get(label);
if (dests == null) {
return null;
@@ -51,7 +51,7 @@ public class DestinationList extends TabFile {
return asText("Ref", "Project", rows);
}
protected static Set<Branch.NameKey> toSet(List<Row> destRows) {
private static Set<Branch.NameKey> toSet(List<Row> destRows) {
Set<Branch.NameKey> dests = Sets.newHashSetWithExpectedSize(destRows.size());
for (Row row : destRows) {
dests.add(new Branch.NameKey(new Project.NameKey(row.right), row.left));

1
java/com/google/gerrit/server/account/VersionedAccountDestinations.java
View File

@@ -16,7 +16,6 @@ package com.google.gerrit.server.account;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.git.DestinationList;
import com.google.gerrit.server.git.ValidationError;
import com.google.gerrit.server.git.meta.TabFile;
import com.google.gerrit.server.git.meta.VersionedMetaData;

3
javatests/com/google/gerrit/server/git/DestinationListTest.java → javatests/com/google/gerrit/server/account/DestinationListTest.java
View File

@@ -12,7 +12,7 @@
// 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;
@@ -20,6 +20,7 @@ import static org.easymock.EasyMock.replay;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.git.ValidationError;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;