reformat code and fix sonar warnings

This commit is contained in:
Skylot
2017-05-27 19:15:55 +03:00
parent 7b9e5fe99f
commit d586c84b56
378 changed files with 1686 additions and 1894 deletions
@@ -96,7 +96,7 @@ public class RunTests {
}
private static List<String> getClasses(ClassLoader clsLoader, String packageName) {
List<String> clsList = new ArrayList<String>();
List<String> clsList = new ArrayList<>();
URL resource = clsLoader.getResource(packageName.replace('.', '/'));
if (resource != null) {
File path = new File(resource.getFile());
@@ -218,8 +218,8 @@ public class TestCF3 extends AbstractTest {
assertTrue(enabled);
assertTrue(testNestedLoops(
new ArrayList<String>(Arrays.asList("a1", "a2")),
new ArrayList<String>(Arrays.asList("a1", "b2"))));
new ArrayList<>(Arrays.asList("a1", "a2")),
new ArrayList<>(Arrays.asList("a1", "b2"))));
List<String> list1 = Arrays.asList(null, "a", "b");
assertEquals(testReturnInLoop(list1), "a");
@@ -85,7 +85,7 @@ public class TestEnum extends AbstractTest {
OBJECT, ARRAY;
private static Set<Types> primitives = EnumSet.of(INT, FLOAT, LONG, DOUBLE);
public static List<Types> references = new ArrayList<Types>();
public static List<Types> references = new ArrayList<>();
static {
references.add(OBJECT);
@@ -35,7 +35,7 @@ public class TestGenerics extends AbstractTest {
}
}
public static Box<Integer> integerBox = new Box<Integer>();
public static Box<Integer> integerBox = new Box<>();
public interface Pair<K, LongGenericType> {
public K getKey();
@@ -63,8 +63,8 @@ public class TestGenerics extends AbstractTest {
}
}
Pair<String, Integer> p1 = new OrderedPair<String, Integer>("8", 8);
OrderedPair<String, Box<Integer>> p = new OrderedPair<String, Box<Integer>>("primes", new Box<Integer>());
Pair<String, Integer> p1 = new OrderedPair<>("8", 8);
OrderedPair<String, Box<Integer>> p = new OrderedPair<>("primes", new Box<Integer>());
public static class Util {
// Generic static method
@@ -75,8 +75,8 @@ public class TestGenerics extends AbstractTest {
}
public static boolean use() {
Pair<Integer, String> p1 = new OrderedPair<Integer, String>(1, "str1");
Pair<Integer, String> p2 = new OrderedPair<Integer, String>(2, "str2");
Pair<Integer, String> p1 = new OrderedPair<>(1, "str1");
Pair<Integer, String> p2 = new OrderedPair<>(2, "str2");
boolean same = Util.<Integer, String>compare(p1, p2);
return same;
}
@@ -168,7 +168,7 @@ public class TestGenerics extends AbstractTest {
}
private List<String> test1(Map<String, String> map) {
List<String> list = new ArrayList<String>();
List<String> list = new ArrayList<>();
String str = map.get("key");
list.add(str);
return list;
@@ -10,7 +10,7 @@ public class TestUnicode extends AbstractTest {
* http://www.ltg.ed.ac.uk/~richard/unicode-sample-3-2.html
*/
public List<String> strings() {
List<String> list = new ArrayList<String>();
List<String> list = new ArrayList<>();
list.add("! \" # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \\ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~");
list.add("¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ");
list.add("∀ ∁ ∂ ∃ ∄ ∅ ∆ ∇ ∈ ∉ ∊ ∋ ∌ ∍ ∎ ∏ ∐ ∑ − ∓ ∔ ∕ ∖ ∗ ∘ ∙ √ ∛ ∜ ∝ ∞ ∟ ∠ ∡ ∢ ∣ ∤ ∥ ∦ ∧ ∨ ∩ ∪ ∫ ∬ ∭ ∮ ∯ ∰ ∱ ∲ ∳ ∴ ∵ ∶ ∷ ∸ ∹ ∺ ∻ ∼ ∽ ∾ ∿ ≀ ≁ ≂ ≃ ≄ ≅ ≆ ≇ ≈ ≉ ≊ ≋ ≌ ≍ ≎ ≏ ≐ ≑ ≒ ≓ ≔ ≕ ≖ ≗ ≘ ≙ ≚ ≛ ≜ ≝ ≞ ≟ ≠ ≡ ≢ ≣ ≤ ≥ ≦ ≧ ≨ ≩ ≪ ≫ ≬ ≭ ≮ ≯ ≰ ≱ ≲ ≳ ≴ ≵ ≶ ≷ ≸ ≹ ≺ ≻ ≼ ≽ ≾ ≿");