Updated POM to use Java 8. Updated some tool versions in the POMs.

This commit is contained in:
LevelX2 2016-09-29 16:21:32 +02:00
parent ca39289a3a
commit 3516dc75e4
3 changed files with 19 additions and 29 deletions

View file

@ -13,8 +13,6 @@ import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.junit.Test;
import org.mage.test.serverside.base.MageTestBase;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
*
@ -84,21 +82,14 @@ public class BoosterGenerationTest extends MageTestBase {
}
private static boolean contains(List<Card> cards, List<String> names, String code) {
for (String name : names) {
if (contains(cards, name, code)) {
return true;
}
}
return false;
return names.stream().anyMatch((name) -> (contains(cards, name, code)));
}
private static boolean contains(List<Card> cards, String name, String code) {
for (Card card : cards) {
if (card.getName().equals(name) && (code == null || card.getExpansionSetCode().equals(code))) {
return true;
}
}
return false;
return cards.stream().anyMatch((card)
-> (card.getName().equals(name)
&& (code == null || card.getExpansionSetCode().equals(code)))
);
}
}