Merge branch 'master' into merge_job_started_messages

pom.xml

@@ -9,7 +9,7 @@
 
     <groupId>com.sonyericsson.hudson.plugins.gerrit</groupId>
     <artifactId>gerrit-trigger</artifactId>
-    <version>2.23.3-SNAPSHOT</version>
+    <version>2.24.1-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <name>Gerrit Trigger</name>
     <description>Integrates with Gerrit code review.</description>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.sonymobile.tools.gerrit</groupId>
             <artifactId>gerrit-events</artifactId>
-            <version>2.10.2</version>
+            <version>2.11.0</version>
             <!-- New source is here: https://github.com/sonyxperiadev/gerrit-events -->
         </dependency>
         <dependency>

src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/job/rest/BuildCompletedRestCommandJob.java

@@ -116,7 +116,8 @@ protected ReviewInput createReview() {
                 }
             }
 
-            return new ReviewInput(message, scoredLabels, commentedFiles).setNotify(notificationLevel);
+            return new ReviewInput(message, scoredLabels, commentedFiles).setNotify(notificationLevel)
+                .setTag(Constants.TAG_VALUE);
         } finally {
             SecurityContextHolder.setContext(old);
         }

src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/job/rest/BuildStartedRestCommandJob.java

@@ -75,7 +75,7 @@ public BuildStartedRestCommandJob(IGerritHudsonTriggerConfig config, List<Run> b
     protected ReviewInput createReview() {
         String message = parameterExpander.getBuildsStartedMessage(builds, listener, event, stats);
         Notify notificationLevel = parameterExpander.getHighestNotificationLevel(builds, false);
-        return new ReviewInput(message).setNotify(notificationLevel);
+        return new ReviewInput(message).setNotify(notificationLevel).setTag(Constants.TAG_VALUE);
     }
 
 }

src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/job/rest/Constants.java

@@ -0,0 +1,36 @@
+/*
+ *  The MIT License
+ *
+ *  Copyright 2013 Jyrki Puttonen. All rights reserved.
+ *  Copyright 2013 Sony Mobile Communications AB. All rights reserved.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+package com.sonyericsson.hudson.plugins.gerrit.trigger.gerritnotifier.job.rest;
+
+/**
+* Constants for REST commands.
+*/
+final class Constants {
+    public static final String TAG_VALUE = "jenkins-gerrit-trigger";
+
+    /** Internal */
+    private Constants() {
+    }
+}

src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritDynamicUrlProcessor.java

@@ -180,7 +180,7 @@ private static List<GerritProject> readAndParseTriggerConfig(BufferedReader read
         char operChar = oper.charAt(0);
         CompareType type = CompareType.findByOperator(operChar);
 
-        logger.trace("==> item:({0}) oper:({1}) text:({2})", new Object[]{item, oper, text});
+        logger.trace("==> item:({}) oper:({}) text:({})", new Object[]{item, oper, text});
 
         if (SHORTNAME_PROJECT.equals(item)) { // Project
           // stash previous project to the list

src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java

@@ -550,7 +550,11 @@ public static GerritTrigger getTrigger(@Nullable Job project) {
      */
     public void cancelTimer() {
         if (gerritTriggerTimerTask != null) {
-            logger.trace("GerritTrigger.cancelTimer(): {0}", job.getName());
+            String name = "N/A";
+            if (job != null) {
+                name = job.getName();
+            }
+            logger.trace("GerritTrigger.cancelTimer(): {}", name);
             gerritTriggerTimerTask.cancel();
             gerritTriggerTimerTask = null;
         }