From e389b9a03998fdf16f12f881b65bdea65d21dfa4 Mon Sep 17 00:00:00 2001
From: Nasser Grainawi <nasser@grainawi.org>
Date: Wed, 18 May 2011 20:01:12 -0700
Subject: [PATCH] Undeprecate a few functions that aren't going away

Change-Id: Ifd0199102a8316a9439f3ad931e6def9c8c4cc85
---
 .../com/google/gerrit/httpd/rpc/BaseServiceImplementation.java  | 2 --
 .../src/main/java/com/google/gerrit/reviewdb/Change.java        | 2 --
 .../src/main/java/com/google/gerrit/server/CurrentUser.java     | 1 -
 3 files changed, 5 deletions(-)

diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java
index 8f9d96edfe..ed21b39492 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java
@@ -39,7 +39,6 @@ public class BaseServiceImplementation {
     this.currentUser = currentUser;
   }
 
-  @Deprecated
   protected Account.Id getAccountId() {
     CurrentUser u = currentUser.get();
     if (u instanceof IdentifiedUser) {
@@ -97,7 +96,6 @@ public class BaseServiceImplementation {
   }
 
   /** Exception whose cause is passed into onFailure. */
-  @Deprecated
   public static class Failure extends Exception {
     private static final long serialVersionUID = 1L;
 
diff --git a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Change.java b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Change.java
index e4ae63dc71..a8694232b0 100644
--- a/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Change.java
+++ b/gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/Change.java
@@ -370,13 +370,11 @@ public final class Change {
   }
 
   /** Legacy 32 bit integer identity for a change. */
-  @Deprecated
   public Change.Id getId() {
     return changeId;
   }
 
   /** Legacy 32 bit integer identity for a change. */
-  @Deprecated
   public int getChangeId() {
     return changeId.get();
   }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java
index 751d2158a7..0d8d19aa02 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java
@@ -69,7 +69,6 @@ public abstract class CurrentUser {
     return getEffectiveGroups().contains(authConfig.getBatchUsersGroup());
   }
 
-  @Deprecated
   public final boolean isAdministrator() {
     return getEffectiveGroups().contains(authConfig.getAdministratorsGroup());
   }