Make Findbugs happy after the Java 7 conversion.

Author: AlexLandau

src/main/java/net/alloyggp/tournament/api/TPlayerScore.java

@@ -38,10 +38,10 @@ public int getSeedFromRoundStart() {
 
     @Override
     public int compareTo(TPlayerScore other) {
-        int scoreComparison = score.compareTo(other.score);
+        //lower PlayerScore is better; higher Score is better
+        int scoreComparison = other.score.compareTo(score);
         if (scoreComparison != 0) {
-            //lower PlayerScore is better; higher Score is better
-            return -scoreComparison;
+            return scoreComparison;
         }
         return Integer.compare(seedFromRoundStart, other.seedFromRoundStart);
     }

src/main/java/net/alloyggp/tournament/internal/MatchResults.java

@@ -3,6 +3,8 @@
 import java.util.Collection;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.HashMultimap;
@@ -26,7 +28,7 @@ public static Set<TMatchResult> filterByStage(Collection<TMatchResult> inputs, f
         return Sets.newHashSet(Collections2.filter(inputs,
                 new Predicate<TMatchResult>() {
             @Override
-            public boolean apply(TMatchResult input) {
+            public boolean apply(@Nonnull TMatchResult input) {
                 String matchId = input.getMatchId();
                 int matchStage = MatchIds.parseStageNumber(matchId);
                 return matchStage == stageNum;
@@ -42,7 +44,7 @@ public static Set<TMatchResult> getResultsPriorToStage(Collection<TMatchResult>
         return Sets.newHashSet(Collections2.filter(inputs,
                 new Predicate<TMatchResult>() {
             @Override
-            public boolean apply(TMatchResult input) {
+            public boolean apply(@Nonnull TMatchResult input) {
                 String matchId = input.getMatchId();
                 int matchStage = MatchIds.parseStageNumber(matchId);
                 return matchStage < stageNum;

src/main/java/net/alloyggp/tournament/internal/SwissFormat1Runner.java

@@ -8,6 +8,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.NotThreadSafe;
@@ -30,18 +31,18 @@
 import com.google.common.collect.SetMultimap;
 import com.google.common.collect.Sets;
 
+import net.alloyggp.tournament.api.TGame;
 import net.alloyggp.tournament.api.TMatchResult;
 import net.alloyggp.tournament.api.TMatchResult.Outcome;
-import net.alloyggp.tournament.internal.spec.MatchSpec;
-import net.alloyggp.tournament.internal.spec.RoundSpec;
 import net.alloyggp.tournament.api.TMatchSetup;
 import net.alloyggp.tournament.api.TNextMatchesResult;
 import net.alloyggp.tournament.api.TPlayer;
 import net.alloyggp.tournament.api.TPlayerScore;
 import net.alloyggp.tournament.api.TRanking;
 import net.alloyggp.tournament.api.TScore;
 import net.alloyggp.tournament.api.TSeeding;
-import net.alloyggp.tournament.api.TGame;
+import net.alloyggp.tournament.internal.spec.MatchSpec;
+import net.alloyggp.tournament.internal.spec.RoundSpec;
 
 public class SwissFormat1Runner implements FormatRunner {
     private static final SwissFormat1Runner INSTANCE = new SwissFormat1Runner();
@@ -780,7 +781,7 @@ private static <K,T> ImmutableMap<K, ImmutableMultiset<ImmutableSet<T>>> toImmut
                 Map<K, Multiset<Set<T>>> map) {
             return ImmutableMap.copyOf(Maps.transformValues(map, new Function<Multiset<Set<T>>, ImmutableMultiset<ImmutableSet<T>>>() {
                 @Override
-                public ImmutableMultiset<ImmutableSet<T>> apply(Multiset<Set<T>> input) {
+                public ImmutableMultiset<ImmutableSet<T>> apply(@Nonnull Multiset<Set<T>> input) {
                     return toImmutableSetEntriedMultiset(input);
                 }
             }));
@@ -799,7 +800,7 @@ private static <K1,K2,V2> ImmutableMap<K1, ImmutableMap<K2, V2>> toImmutableMapV
                 Map<K1, Map<K2, V2>> map) {
             return ImmutableMap.copyOf(Maps.transformValues(map, new Function<Map<K2, V2>, ImmutableMap<K2, V2>>() {
                 @Override
-                public ImmutableMap<K2, V2> apply(Map<K2, V2> input) {
+                public ImmutableMap<K2, V2> apply(@Nonnull Map<K2, V2> input) {
                     return ImmutableMap.copyOf(input);
                 }
             }));

src/test/java/net/alloyggp/tournament/SingleEliminationVictoryTest.java

@@ -6,6 +6,8 @@
 import java.util.Random;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -37,7 +39,7 @@ public static Iterable<Object[]> data() {
         return Iterables.filter(FuzzTests.getParameters(),
                 new Predicate<Object[]>() {
                     @Override
-                    public boolean apply(Object[] arguments) {
+                    public boolean apply(@Nonnull Object[] arguments) {
                         String testSpec = (String) arguments[1];
                         return testSpec.startsWith("singleElim");
                     }