diff --git a/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java b/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java index aef924826b1..5b3ce77e293 100644 --- a/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java @@ -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 cards, List 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 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))) + ); } } diff --git a/Mage/pom.xml b/Mage/pom.xml index ac64aa67fda..186a1eee912 100644 --- a/Mage/pom.xml +++ b/Mage/pom.xml @@ -34,7 +34,6 @@ junit junit - 4.12 com.google.protobuf @@ -145,7 +144,7 @@ mage - + diff --git a/pom.xml b/pom.xml index c3653bde465..35784b75074 100644 --- a/pom.xml +++ b/pom.xml @@ -15,10 +15,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.2 + 3.5.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 false - + maven-resources-plugin 2.7 - UTF-8 + UTF-8 maven-jar-plugin 2.5 - - - - MageTeam - - - + + + + MageTeam + + + @@ -102,7 +102,7 @@ org.slf4j slf4j-log4j12 - 1.7.10 + 1.7.19