From 14cbd792f2b8497ee1a31015dd7cac0350e4dcae Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 2 Sep 2015 10:56:36 +0900 Subject: [PATCH] CommitPredicate: Use static import for constants Instead of importing the whole package and then only using a single constant from it. Change-Id: I7c217334a9b70339af17ee5de32eae3073b37678 --- .../gerrit/server/query/change/CommitPredicate.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java index a63f80cf3d..983e8ef1b2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java @@ -14,25 +14,24 @@ package com.google.gerrit.server.query.change; +import static com.google.gerrit.server.index.ChangeField.COMMIT; import static com.google.gerrit.server.index.ChangeField.EXACT_COMMIT; +import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH; import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.gerrit.server.index.ChangeField; import com.google.gerrit.server.index.FieldDef; import com.google.gerrit.server.index.IndexPredicate; import com.google.gerrit.server.index.Schema; import com.google.gwtorm.server.OrmException; -import org.eclipse.jgit.lib.Constants; - class CommitPredicate extends IndexPredicate { static FieldDef commitField(Schema schema, String id) { - if (id.length() == Constants.OBJECT_ID_STRING_LENGTH + if (id.length() == OBJECT_ID_STRING_LENGTH && schema.hasField(EXACT_COMMIT)) { return EXACT_COMMIT; } - return ChangeField.COMMIT; + return COMMIT; } CommitPredicate(Schema schema, String id) {