opendev/gerrit
Code Issues Proposed changes

Replace Guava Longs.compare with Java 7 Long.compare

Browse Source 
As compare is now available as part of the runtime, just use the
standard function.

Change-Id: I7b2eb2587800a6549263ede90339adeab8c946a5
This commit is contained in:
Shawn Pearce
2014-02-11 15:59:23 -08:00
parent b43baf2159
commit 929879fb93
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteLibraryBasedDataSourceProvider.java
View File

@@ -14,7 +14,6 @@
package com.google.gerrit.pgm.util; package com.google.gerrit.pgm.util;
import com.google.common.primitives.Longs;
import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.schema.DataSourceProvider; import com.google.gerrit.server.schema.DataSourceProvider;
@@ -68,7 +67,7 @@ public class SiteLibraryBasedDataSourceProvider extends DataSourceProvider {
@Override @Override
public int compare(File a, File b) { public int compare(File a, File b) {
// Sort by reverse last-modified time so newer JARs are first. // Sort by reverse last-modified time so newer JARs are first.
int cmp = Longs.compare(b.lastModified(), a.lastModified()); int cmp = Long.compare(b.lastModified(), a.lastModified());
if (cmp != 0) { if (cmp != 0) {
return cmp; return cmp;
} }

3
gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_65.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.server.schema;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.primitives.Longs;
import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.AccessSection;
import com.google.gerrit.common.data.ContributorAgreement; import com.google.gerrit.common.data.ContributorAgreement;
import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.common.data.GlobalCapability;
@@ -448,7 +447,7 @@ public class Schema_65 extends SchemaVersion {
@Override @Override
public int compare( public int compare(
AccountGroupAgreement a1, AccountGroupAgreement a2) { AccountGroupAgreement a1, AccountGroupAgreement a2) {
return Longs.compare(a1.getTime(), a2.getTime()); return Long.compare(a1.getTime(), a2.getTime());
} }
}); });
return groupAgreements; return groupAgreements;