1. Sebastian Sdorra
  2. scm-jira-plugin

Commits

Sebastian Sdorra  committed 5fa48bf

use global configuration if repository configuration is disabled

  • Participants
  • Parent commits 8cf6aaa
  • Branches default

Comments (0)

Files changed (3)

File src/main/java/sonia/scm/jira/JiraChangesetPreProcessorFactory.java

View file
 import sonia.scm.repository.ChangesetPreProcessorFactory;
 import sonia.scm.repository.Repository;
 import sonia.scm.util.HttpUtil;
-import sonia.scm.util.Util;
 
 //~--- JDK imports ------------------------------------------------------------
 
   public JiraChangesetPreProcessor createPreProcessor(Repository repository)
   {
     JiraChangesetPreProcessor cpp = null;
-    String jiraUrl = repository.getProperty(PROPERTY_JIRA_URL);
 
-    if (Strings.isNullOrEmpty(jiraUrl))
-    {
-      jiraUrl = context.getConfiguration().getUrl();
-    }
+    JiraConfiguration configuration =
+      JiraConfigurationResolver.resolve(context, repository);
+
+    String jiraUrl = configuration.getUrl();
 
     if (!Strings.isNullOrEmpty(jiraUrl))
     {

File src/main/java/sonia/scm/jira/JiraConfigurationResolver.java

View file
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.jira;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import sonia.scm.repository.Repository;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class JiraConfigurationResolver
+{
+
+  /**
+   * the logger for JiraConfigurationResolver
+   */
+  private static final Logger logger =
+    LoggerFactory.getLogger(JiraConfigurationResolver.class);
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param context
+   * @param repository
+   *
+   * @return
+   */
+  public static JiraConfiguration resolve(JiraGlobalContext context,
+    Repository repository)
+  {
+    JiraConfiguration configuration;
+
+    if (context.getConfiguration().isDisableRepositoryConfiguration())
+    {
+      if (logger.isDebugEnabled())
+      {
+        logger.debug(
+          "repository configuration is disabled, try to use global configuration");
+      }
+
+      configuration = context.getConfiguration();
+    }
+    else
+    {
+      configuration = new JiraConfiguration(repository);
+
+      if (!configuration.isValid())
+      {
+        if (logger.isDebugEnabled())
+        {
+          logger.debug(
+            "repository configuration is not valid, try to use global configuration");
+        }
+
+        configuration = context.getConfiguration();
+      }
+
+    }
+
+    return configuration;
+  }
+}

File src/main/java/sonia/scm/jira/JiraIssuePostReceiveHook.java

View file
 
     if (repository != null)
     {
-      JiraConfiguration configuration = new JiraConfiguration(repository);
-
-      if (!configuration.isValid())
-      {
-        if (logger.isDebugEnabled())
-        {
-          logger.debug(
-            "repository configuration is not valid, try to use global configuration");
-        }
-
-        configuration = context.getConfiguration();
-      }
+      JiraConfiguration configuration =
+        JiraConfigurationResolver.resolve(context, repository);
 
       if (configuration.isValid())
       {