Merge "Make BranchResource and TagResource extend a common class"

gerrit-server/src/main/java/com/google/gerrit/server/project/BranchResource.java

@@ -19,7 +19,7 @@ import com.google.gerrit.extensions.restapi.RestView;
 import com.google.gerrit.reviewdb.client.Branch;
 import com.google.inject.TypeLiteral;
 
-public class BranchResource extends ProjectResource {
+public class BranchResource extends RefResource {
   public static final TypeLiteral<RestView<BranchResource>> BRANCH_KIND =
       new TypeLiteral<RestView<BranchResource>>() {};
 
@@ -38,10 +38,12 @@ public class BranchResource extends ProjectResource {
     return new Branch.NameKey(getNameKey(), branchInfo.ref);
   }
 
+  @Override
   public String getRef() {
     return branchInfo.ref;
   }
 
+  @Override
   public String getRevision() {
     return branchInfo.revision;
   }

gerrit-server/src/main/java/com/google/gerrit/server/project/RefResource.java

@@ -0,0 +1,32 @@
+// Copyright (C) 2016 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.server.project;
+
+public abstract class RefResource extends ProjectResource {
+
+  public RefResource(ProjectControl control) {
+    super(control);
+  }
+
+  /**
+   * @return the ref's name
+   */
+  public abstract String getRef();
+
+  /**
+   * @return the ref's revision
+   */
+  public abstract String getRevision();
+}

gerrit-server/src/main/java/com/google/gerrit/server/project/TagResource.java

@@ -18,18 +18,28 @@ import com.google.gerrit.extensions.api.projects.TagInfo;
 import com.google.gerrit.extensions.restapi.RestView;
 import com.google.inject.TypeLiteral;
 
-public class TagResource extends ProjectResource {
+public class TagResource extends RefResource {
   public static final TypeLiteral<RestView<TagResource>> TAG_KIND =
       new TypeLiteral<RestView<TagResource>>() {};
 
-  private final TagInfo tag;
+  private final TagInfo tagInfo;
 
-  public TagResource(ProjectControl control, TagInfo tag) {
+  public TagResource(ProjectControl control, TagInfo tagInfo) {
     super(control);
-    this.tag = tag;
+    this.tagInfo = tagInfo;
   }
 
   public TagInfo getTagInfo() {
-    return tag;
+    return tagInfo;
+  }
+
+  @Override
+  public String getRef() {
+    return tagInfo.ref;
+  }
+
+  @Override
+  public String getRevision() {
+    return tagInfo.revision;
   }
 }