From 529cf2f090fef1ec2fd63cca06b85d9da39275e4 Mon Sep 17 00:00:00 2001
From: Edwin Kempin <ekempin@google.com>
Date: Mon, 13 Nov 2017 11:08:45 +0100
Subject: [PATCH] Revert "Add deprecation notice to GetOwner and SetOwner for
 groups"

As explained in change Id18851f503 we want to continue supporting the
GetOwner and SetOwner REST endpoints, hence revert the deprecation.

This reverts commit a61a631959a79ed0ba12673910e4d388b54ec050.

Change-Id: Ie311c6c694195d939c508f35dd0b4c0cffa2ec72
---
 Documentation/rest-api-groups.txt                      |  4 ----
 .../google/gerrit/extensions/api/groups/GroupApi.java  | 10 +---------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/Documentation/rest-api-groups.txt b/Documentation/rest-api-groups.txt
index 23a1f96e87..63d0b4019e 100644
--- a/Documentation/rest-api-groups.txt
+++ b/Documentation/rest-api-groups.txt
@@ -771,8 +771,6 @@ link:#group-options-info[GroupOptionsInfo] entity.
 
 Retrieves the owner group of a Gerrit internal group.
 
-[NOTE] This endpoint is deprecated and will be removed in a future Gerrit release.
-
 .Request
 ----
   GET /groups/9999c971bb4ab872aab759d8c49833ee6b9ff320/owner HTTP/1.0
@@ -815,8 +813,6 @@ The new owner group must be provided in the request body.
 The new owner can be specified by name, by group UUID or by the legacy
 numeric group ID.
 
-[NOTE] This endpoint is deprecated and will be removed in a future Gerrit release.
-
 .Request
 ----
   PUT /groups/9999c971bb4ab872aab759d8c49833ee6b9ff320/owner HTTP/1.0
diff --git a/java/com/google/gerrit/extensions/api/groups/GroupApi.java b/java/com/google/gerrit/extensions/api/groups/GroupApi.java
index 5137cdd350..fe85eaadca 100644
--- a/java/com/google/gerrit/extensions/api/groups/GroupApi.java
+++ b/java/com/google/gerrit/extensions/api/groups/GroupApi.java
@@ -40,12 +40,7 @@ public interface GroupApi {
    */
   void name(String name) throws RestApiException;
 
-  /**
-   * @return owning group info.
-   * @deprecated for groups in NoteDb, use READ/PUSH permissions on the group ref to express
-   *     ownership.
-   */
-  @Deprecated
+  /** @return owning group info. */
   GroupInfo owner() throws RestApiException;
 
   /**
@@ -53,10 +48,7 @@ public interface GroupApi {
    *
    * @param owner identifier of new group owner.
    * @throws RestApiException
-   * @deprecated for groups in NoteDb, use READ/PUSH permissions on the group ref to express
-   *     ownership.
    */
-  @Deprecated
   void owner(String owner) throws RestApiException;
 
   /** @return group description. */