Merge pull request #172 from jimklimov/fix-warnings

Fix warnings exposed by PR #171

pom.xml

@@ -171,7 +171,7 @@
     </developers>
 
     <scm>
-        <connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
+        <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
         <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
         <url>https://github.com/${gitHubRepo}</url>
         <tag>${scmTag}</tag>

src/main/java/hudson/plugins/im/IMPublisher.java

@@ -631,8 +631,10 @@ private boolean downstreamIsFirstInRangeTriggeredByUpstream(
             AbstractBuild<?, ?> upstreamBuild, AbstractBuild<?, ?> downstreamBuild) {
         RangeSet rangeSet = upstreamBuild.getDownstreamRelationship(downstreamBuild.getProject());
 
-        if (rangeSet.isEmpty()) {
+        if (rangeSet == null || rangeSet.isEmpty()) {
             // should not happen
+            // In fact, getDownstreamRelationship() should never return "null"
+            // at all - but sometimes does at least in mock-enhanced test classes.
             LOGGER.warning("Range set is empty. Upstream " + upstreamBuild + ", downstream " + downstreamBuild);
             return false;
         }

src/main/java/hudson/plugins/im/tools/BuildHelper.java

@@ -161,6 +161,7 @@ public static boolean isStillFailureOrUnstable(AbstractBuild<?, ?> build) {
      *
      * @deprecated use {@link Run#getPreviousSuccessfulBuild()}
     */
+    @Deprecated
     public static AbstractBuild<?, ?> getPreviousSuccessfulBuild(AbstractBuild<?, ?> build) {
         AbstractBuild<?, ?> previousBuild = build.getPreviousBuild();
         while (previousBuild != null) {

src/main/java/hudson/plugins/jabber/NotificationStrategy.java

@@ -14,6 +14,7 @@
  *
  * @deprecated only left here to deserialize old configs
  */
+@Deprecated
 public enum NotificationStrategy {
 
     // Note that the order of the constants also specifies the display order!

src/test/java/hudson/plugins/im/IMPublisherTest.java

@@ -103,12 +103,12 @@ public void before() throws IOException {
 
         this.build = mock(AbstractBuild.class);
         when(this.build.getResult()).thenReturn(Result.FAILURE);
-        when(build.getUpstreamRelationshipBuild(upstreamProject)).thenReturn(this.upstreamBuild);
+        when(this.build.getUpstreamRelationshipBuild(this.upstreamProject)).thenReturn(this.upstreamBuild);
         Map<AbstractProject, Integer> upstreamBuilds = Maps.newHashMap();
         upstreamBuilds.put(this.upstreamProject, -1); // number is unimportant, just needed to get the upstream projects
-        when(build.getUpstreamBuilds()).thenReturn(upstreamBuilds);
-        when(build.getParent()).thenReturn(this.project);
-        when(build.getNumber()).thenReturn(buildNumber);
+        when(this.build.getUpstreamBuilds()).thenReturn(upstreamBuilds);
+        when(this.build.getParent()).thenReturn(this.project);
+        when(this.build.getNumber()).thenReturn(this.buildNumber);
 
         createPreviousNextRelationShip(this.previousBuild, this.build);