opendev/gerrit
Code Issues Proposed changes

VersionedAccountPreferences: Move into schema package and make package-private

Browse Source 
Preferences are available through AccountState which can be retrieved
from the AccountCache. To update preferences AccountsUpdate should be
used.

VersionedAccountPreferences is only kept to support old schema
migrations and should be deleted when these schema migrations are no
longer needed (when ReviewDb gets deleted). Until then make sure that
VersionedAccountPreferences is only used for schema migrations by moving
it into the schema package and making it package-private.

Change-Id: I4ec7fe238839ace52a9865f0724597da10fc7b7f
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2018-01-19 10:30:54 +01:00
parent bf829b1e17
commit e518d9dacc
5 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/com/google/gerrit/server/schema/Schema_115.java
View File

@@ -24,7 +24,6 @@ import com.google.gerrit.extensions.client.Theme;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.GerritPersonIdent;
import com.google.gerrit.server.account.VersionedAccountPreferences;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.git.GitRepositoryManager;

1
java/com/google/gerrit/server/schema/Schema_119.java
View File

@@ -34,7 +34,6 @@ import com.google.gerrit.extensions.client.GeneralPreferencesInfo.TimeFormat;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.GerritPersonIdent;
import com.google.gerrit.server.account.VersionedAccountPreferences;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.git.GitRepositoryManager;

1
java/com/google/gerrit/server/schema/Schema_160.java
View File

@@ -23,7 +23,6 @@ import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.GerritPersonIdent;
import com.google.gerrit.server.account.Accounts;
import com.google.gerrit.server.account.VersionedAccountPreferences;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.git.GitRepositoryManager;

20
java/com/google/gerrit/server/account/VersionedAccountPreferences.java → java/com/google/gerrit/server/schema/VersionedAccountPreferences.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.account;
package com.google.gerrit.server.schema;
import com.google.common.base.Strings;
import com.google.gerrit.reviewdb.client.Account;
@@ -23,18 +23,14 @@ import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.CommitBuilder;
import org.eclipse.jgit.lib.Config;
/** Preferences for user accounts. */
public class VersionedAccountPreferences extends VersionedMetaData {
public static final String PREFERENCES = "preferences.config";
/** Preferences for user accounts during schema migrations. */
class VersionedAccountPreferences extends VersionedMetaData {
private static final String PREFERENCES = "preferences.config";
public static VersionedAccountPreferences forUser(Account.Id id) {
static VersionedAccountPreferences forUser(Account.Id id) {
return new VersionedAccountPreferences(RefNames.refsUsers(id));
}
public static VersionedAccountPreferences forDefault() {
return new VersionedAccountPreferences(RefNames.REFS_USERS_DEFAULT);
}
private final String ref;
private Config cfg;
@@ -42,16 +38,12 @@ public class VersionedAccountPreferences extends VersionedMetaData {
this.ref = ref;
}
public boolean isDefaults() {
return RefNames.REFS_USERS_DEFAULT.equals(getRefName());
}
@Override
protected String getRefName() {
return ref;
}
public Config getConfig() {
Config getConfig() {
return cfg;
}

1
javatests/com/google/gerrit/server/schema/Schema_159_to_160_Test.java
View File

@@ -30,7 +30,6 @@ import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.VersionedAccountPreferences;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.testing.SchemaUpgradeTestEnvironment;