Expose GitHubOAuthConfig.getVirtualScopes as static method

Avoid the use of Lombok's getter for calculating the virtual scopes
but expose the method for extracting them from config as a
package-protected static method.

Change-Id: I68b53e000009564785c87027c634215d4c264d0c

github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java

diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java
index 7645af5..8993d3f 100644
--- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java
+++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java
@@ -39,7 +39,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import lombok.Getter;
 import org.eclipse.jgit.lib.Config;
 
 @Singleton
@@ -69,8 +68,8 @@
   public final String scopeSelectionUrl;
   public final boolean enabled;
 
-  @Getter public final SortedMap<ScopeKey, List<OAuthProtocol.Scope>> scopes;
-  @Getter public final Map<String, SortedMap<ScopeKey, List<OAuthProtocol.Scope>>> virtualScopes;
+  public final SortedMap<ScopeKey, List<OAuthProtocol.Scope>> scopes;
+  public final Map<String, SortedMap<ScopeKey, List<OAuthProtocol.Scope>>> virtualScopes;
 
   public final int fileUpdateMaxRetryCount;
   public final int fileUpdateMaxRetryIntervalMsec;
@@ -153,12 +152,13 @@
     return getScopesInSection(config, null);
   }
 
-  private Map<String, SortedMap<ScopeKey, List<Scope>>> getVirtualScopes(Config config) {
+  static Map<String, SortedMap<ScopeKey, List<Scope>>> getVirtualScopes(Config config) {
     return config.getSubsections(CONF_SECTION).stream()
         .collect(Collectors.toMap(k -> k, v -> getScopesInSection(config, v)));
   }
 
-  private SortedMap<ScopeKey, List<Scope>> getScopesInSection(Config config, String subsection) {
+  private static SortedMap<ScopeKey, List<Scope>> getScopesInSection(
+      Config config, String subsection) {
     return config.getNames(CONF_SECTION, subsection, true).stream()
         .filter(k -> k.startsWith("scopes"))
         .filter(k -> !k.endsWith("Description"))
@@ -174,7 +174,7 @@
                 v -> parseScopesString(config.getString(CONF_SECTION, subsection, v))));
   }
 
-  private List<Scope> parseScopesString(String scopesString) {
+  private static List<Scope> parseScopesString(String scopesString) {
     ArrayList<Scope> result = new ArrayList<>();
     if (Strings.emptyToNull(scopesString) != null) {
       String[] scopesStrings = scopesString.split(",");

github-oauth/src/test/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfigTest.java

diff --git a/github-oauth/src/test/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfigTest.java b/github-oauth/src/test/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfigTest.java
index 602fb76..d79b3b7 100644
--- a/github-oauth/src/test/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfigTest.java
+++ b/github-oauth/src/test/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfigTest.java
@@ -185,8 +185,7 @@
     config.setInt(CONF_SECTION, vhost, scope1Name + "Sequence", 0);
     config.setString(CONF_SECTION, vhost, scope1Name + "Description", scope1Description);
 
-    Map<String, SortedMap<ScopeKey, List<OAuthProtocol.Scope>>> virtualScopes =
-        githubOAuthConfig().getVirtualScopes();
+    Map<String, SortedMap<ScopeKey, List<OAuthProtocol.Scope>>> virtualScopes = getVirtualScopes();
 
     assertTrue(virtualScopes.containsKey(vhost));
 
@@ -206,6 +205,10 @@
     assertEquals(List.of(OAuthProtocol.Scope.USER_EMAIL), secondEntry.getValue());
   }
 
+  private Map<String, SortedMap<ScopeKey, List<OAuthProtocol.Scope>>> getVirtualScopes() {
+    return GitHubOAuthConfig.getVirtualScopes(config);
+  }
+
   private GitHubOAuthConfig githubOAuthConfig() {
     return new GitHubOAuthConfig(config);
   }