From 8ff798add45d96c668a9b8215e5ad2edabde7e89 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 18 Feb 2016 17:51:19 +0900 Subject: [PATCH] Move InvalidUserNameException to com.google.gerrit.server.account Because that's the only package where it's used. Change-Id: I2df2ac9f519131016cde03e277d3832524a02625 --- .../java/com/google/gerrit/server/account/AccountManager.java | 1 - .../java/com/google/gerrit/server/account/ChangeUserName.java | 1 - .../google/gerrit/server/account}/InvalidUserNameException.java | 2 +- .../main/java/com/google/gerrit/server/account/PutUsername.java | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) rename {gerrit-common/src/main/java/com/google/gerrit/common/errors => gerrit-server/src/main/java/com/google/gerrit/server/account}/InvalidUserNameException.java (95%) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java index 4a9d2633f9..9ac20f6420 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java @@ -20,7 +20,6 @@ import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.common.data.Permission; -import com.google.gerrit.common.errors.InvalidUserNameException; import com.google.gerrit.common.errors.NameAlreadyUsedException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountExternalId; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java index b413e815e9..f466fa39fc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.account; import static com.google.gerrit.reviewdb.client.AccountExternalId.SCHEME_USERNAME; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.errors.InvalidUserNameException; import com.google.gerrit.common.errors.NameAlreadyUsedException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountExternalId; diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidUserNameException.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/InvalidUserNameException.java similarity index 95% rename from gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidUserNameException.java rename to gerrit-server/src/main/java/com/google/gerrit/server/account/InvalidUserNameException.java index f1c35a803d..d60b7af85f 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/errors/InvalidUserNameException.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/InvalidUserNameException.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.gerrit.common.errors; +package com.google.gerrit.server.account; import com.google.gerrit.reviewdb.client.Account; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutUsername.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutUsername.java index 9506b01193..6f20e9affb 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutUsername.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutUsername.java @@ -14,7 +14,6 @@ package com.google.gerrit.server.account; -import com.google.gerrit.common.errors.InvalidUserNameException; import com.google.gerrit.common.errors.NameAlreadyUsedException; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.DefaultInput;