Undeprecate a few functions that aren't going away

Change-Id: Ifd0199102a8316a9439f3ad931e6def9c8c4cc85
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 8f9d96e..ed21b39 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 @@
     this.currentUser = currentUser;
   }
 
-  @Deprecated
   protected Account.Id getAccountId() {
     CurrentUser u = currentUser.get();
     if (u instanceof IdentifiedUser) {
@@ -97,7 +96,6 @@
   }
 
   /** 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 e4ae63d..a869423 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 @@
   }
 
   /** 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 751d215..0d8d19a 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 @@
     return getEffectiveGroups().contains(authConfig.getBatchUsersGroup());
   }
 
-  @Deprecated
   public final boolean isAdministrator() {
     return getEffectiveGroups().contains(authConfig.getAdministratorsGroup());
   }