commit e6b43ee57230112e60977f6a2801ff7633cd0b26
author Nitzan Gur-Furman <nitzan@google.com> Thu Jul 18 08:39:02 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 18 08:39:02 2024 +0000
tree cdc85af0e4d1d346a2ab95defa25777a618c558f
parent 3a67865b545249fa3c3dba9af6cd03f9d1ac815b
parent a31ac83fe5e8f72902bddbc8baefe8c49702b102

Merge "CachedPreferences: Remove obsolete call to PreferencesParser#parse"

java/com/google/gerrit/server/config/CachedPreferences.java

diff --git a/java/com/google/gerrit/server/config/CachedPreferences.java b/java/com/google/gerrit/server/config/CachedPreferences.java
index 309d1fd..3b013c0 100644
--- a/java/com/google/gerrit/server/config/CachedPreferences.java
+++ b/java/com/google/gerrit/server/config/CachedPreferences.java
@@ -126,10 +126,8 @@
       CachedPreferencesProto userPreferencesProto = userPreferences.config();
       switch (userPreferencesProto.getPreferencesCase()) {
         case USER_PREFERENCES:
-          PreferencesT pref =
-              preferencesParser.fromUserPreferences(
-                  userPreferencesProto.getUserPreferences(), configOrNull(defaultPreferences));
-          return preferencesParser.parse(pref, configOrNull(defaultPreferences));
+          return preferencesParser.fromUserPreferences(
+              userPreferencesProto.getUserPreferences(), configOrNull(defaultPreferences));
         case LEGACY_GIT_CONFIG:
           return preferencesParser.parse(
               userPreferences.asConfig(), configOrNull(defaultPreferences), null);

java/com/google/gerrit/server/config/PreferencesParserUtil.java

diff --git a/java/com/google/gerrit/server/config/PreferencesParserUtil.java b/java/com/google/gerrit/server/config/PreferencesParserUtil.java
index 9249b3c..3e39e25 100644
--- a/java/com/google/gerrit/server/config/PreferencesParserUtil.java
+++ b/java/com/google/gerrit/server/config/PreferencesParserUtil.java
@@ -324,8 +324,6 @@
     T parse(Config cfg, @Nullable Config defaultConfig, @Nullable T input)
         throws ConfigInvalidException;
 
-    T parse(T cfg, @Nullable Config defaultConfig) throws ConfigInvalidException;
-
     T fromUserPreferences(UserPreferences userPreferences, @Nullable Config defaultCfg)
         throws ConfigInvalidException;
 
@@ -347,12 +345,6 @@
     }
 
     @Override
-    public GeneralPreferencesInfo parse(GeneralPreferencesInfo cfg, @Nullable Config defaultCfg)
-        throws ConfigInvalidException {
-      return PreferencesParserUtil.parseGeneralPreferences(cfg, defaultCfg);
-    }
-
-    @Override
     public GeneralPreferencesInfo fromUserPreferences(
         UserPreferences p, @Nullable Config defaultCfg) throws ConfigInvalidException {
       return PreferencesParserUtil.parseGeneralPreferences(
@@ -379,12 +371,6 @@
     }
 
     @Override
-    public EditPreferencesInfo parse(EditPreferencesInfo cfg, @Nullable Config defaultCfg)
-        throws ConfigInvalidException {
-      return PreferencesParserUtil.parseEditPreferences(cfg, defaultCfg);
-    }
-
-    @Override
     public EditPreferencesInfo fromUserPreferences(UserPreferences p, @Nullable Config defaultCfg)
         throws ConfigInvalidException {
       return PreferencesParserUtil.parseEditPreferences(
@@ -411,12 +397,6 @@
     }
 
     @Override
-    public DiffPreferencesInfo parse(DiffPreferencesInfo cfg, @Nullable Config defaultCfg)
-        throws ConfigInvalidException {
-      return PreferencesParserUtil.parseDiffPreferences(cfg, defaultCfg);
-    }
-
-    @Override
     public DiffPreferencesInfo fromUserPreferences(UserPreferences p, @Nullable Config defaultCfg)
         throws ConfigInvalidException {
       return PreferencesParserUtil.parseDiffPreferences(