From 62087521be600297b86044f0b4dd64f721ff6629 Mon Sep 17 00:00:00 2001
From: Johannes Schnatterer <johannes.schnatterer@cloudogu.com>
Date: Thu, 2 Aug 2018 14:16:26 +0200
Subject: [PATCH] Config Resources: Makes permission names publicly available

---
 .../src/main/java/sonia/scm/config/ScmConfiguration.java   | 7 ++++---
 .../src/main/java/sonia/scm/repository/GitConfig.java      | 7 +++++--
 .../src/main/java/sonia/scm/repository/HgConfig.java       | 4 +++-
 .../src/main/java/sonia/scm/repository/SvnConfig.java      | 5 ++++-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java b/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java
index 6e1db68f91..e94fabfa60 100644
--- a/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java
+++ b/scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java
@@ -90,9 +90,10 @@ public class ScmConfiguration implements Configuration {
   /**
    * the logger for ScmConfiguration
    */
-  private static final Logger logger =
-    LoggerFactory.getLogger(ScmConfiguration.class);
+  private static final Logger logger = LoggerFactory.getLogger(ScmConfiguration.class);
 
+  @SuppressWarnings("WeakerAccess") // This might be needed for permission checking
+  public static final String PERMISSION = "global";
 
   @XmlElement(name = "admin-groups")
   @XmlJavaTypeAdapter(XmlSetStringAdapter.class)
@@ -509,6 +510,6 @@ public class ScmConfiguration implements Configuration {
   @XmlTransient
   public String getId() {
     // Don't change this without migrating SCM permission configuration!
-    return "global";
+    return PERMISSION;
   }
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitConfig.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitConfig.java
index 3569fee179..03f38b0086 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitConfig.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitConfig.java
@@ -48,7 +48,10 @@ import javax.xml.bind.annotation.XmlTransient;
 @XmlRootElement(name = "config")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class GitConfig extends RepositoryConfig {
-  
+
+  @SuppressWarnings("WeakerAccess") // This might be needed for permission checking
+  public static final String PERMISSION = "git";
+
   @XmlElement(name = "gc-expression")
   private String gcExpression;
 
@@ -65,6 +68,6 @@ public class GitConfig extends RepositoryConfig {
   @XmlTransient // Only for permission checks, don't serialize to XML
   public String getId() {
     // Don't change this without migrating SCM permission configuration!
-    return "git";
+    return PERMISSION;
   }
 }
diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgConfig.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgConfig.java
index 6438f49d4c..41b0f8d205 100644
--- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgConfig.java
+++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgConfig.java
@@ -48,6 +48,8 @@ import javax.xml.bind.annotation.XmlTransient;
 public class HgConfig extends RepositoryConfig
 {
 
+  public static final String PERMISSION = "hg";
+
   /**
    * Constructs ...
    *
@@ -227,6 +229,6 @@ public class HgConfig extends RepositoryConfig
   @XmlTransient // Only for permission checks, don't serialize to XML
   public String getId() {
     // Don't change this without migrating SCM permission configuration!
-    return "hg";
+    return PERMISSION;
   }
 }
diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnConfig.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnConfig.java
index 73b4f39219..5fe5c0815d 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnConfig.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnConfig.java
@@ -48,6 +48,9 @@ import javax.xml.bind.annotation.XmlTransient;
 public class SvnConfig extends RepositoryConfig
 {
 
+  @SuppressWarnings("WeakerAccess") // This might be needed for permission checking
+  public static final String PERMISSION = "svn";
+
   /**
    * Method description
    *
@@ -112,6 +115,6 @@ public class SvnConfig extends RepositoryConfig
   @XmlTransient // Only for permission checks, don't serialize to XML
   public String getId() {
     // Don't change this without migrating SCM permission configuration!
-    return "svn";
+    return PERMISSION;
   }
 }