Skip to content

Commit 6ac8891

Browse files
authored
Merge pull request #87 from scijava/scijava/incubator/remove-wildcard-imports
Remove wildcard imports
2 parents 25420aa + 1365ae1 commit 6ac8891

23 files changed

Lines changed: 182 additions & 74 deletions

File tree

‎imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@
2929

3030
package net.imagej.ops2;
3131

32-
import io.scif.img.IO;
33-
3432
import java.net.URL;
35-
import java.util.*;
3633
import java.util.stream.StreamSupport;
3734

35+
import org.scijava.ops.api.OpEnvironment;
36+
import org.scijava.ops.engine.DefaultOpEnvironment;
37+
import org.scijava.ops.spi.Op;
38+
import org.scijava.threads.DefaultThreadManager;
39+
import org.scijava.threads.ThreadManager;
40+
41+
import io.scif.img.IO;
3842
import net.imglib2.Cursor;
3943
import net.imglib2.IterableInterval;
4044
import net.imglib2.RandomAccess;
@@ -48,21 +52,6 @@
4852
import net.imglib2.type.numeric.real.FloatType;
4953
import net.imglib2.view.Views;
5054

51-
import org.junit.jupiter.api.AfterAll;
52-
import org.junit.jupiter.api.BeforeAll;
53-
import org.scijava.discovery.Discoverer;
54-
import org.scijava.log2.Logger;
55-
import org.scijava.log2.StderrLoggerFactory;
56-
import org.scijava.ops.api.OpEnvironment;
57-
import org.scijava.ops.api.OpHistory;
58-
import org.scijava.ops.engine.DefaultOpEnvironment;
59-
import org.scijava.ops.engine.DefaultOpHistory;
60-
import org.scijava.ops.spi.Op;
61-
import org.scijava.threads.DefaultThreadManager;
62-
import org.scijava.threads.ThreadManager;
63-
import org.scijava.types.DefaultTypeReifier;
64-
import org.scijava.types.TypeReifier;
65-
6655
/**
6756
* Base class for Op unit testing.
6857
* <p>

‎imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@
3030
package net.imagej.ops2.copy;
3131

3232
import net.imagej.ops2.AbstractOpTest;
33-
import net.imglib2.*;
33+
import net.imglib2.Cursor;
34+
import net.imglib2.FinalDimensions;
35+
import net.imglib2.FinalInterval;
36+
import net.imglib2.RandomAccess;
37+
import net.imglib2.RandomAccessibleInterval;
3438
import net.imglib2.img.Img;
3539
import net.imglib2.img.array.ArrayImgFactory;
3640
import net.imglib2.img.planar.PlanarImgFactory;
@@ -49,7 +53,7 @@
4953
import static org.junit.jupiter.api.Assertions.assertNotNull;
5054

5155
/**
52-
* Test {@link Copiers#copyRAI(Computers.Arity1, RandomAccessibleInterval, RandomAccessibleInterval)}
56+
* Test copying {@link net.imglib2.RandomAccessibleInterval}s
5357
*
5458
* @author Tim-Oliver Buchholz (University of Konstanz)
5559
*/

‎scijava/scijava-common3/src/test/java/org/scijava/common3/ClassesTest.java‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11

22
package org.scijava.common3;
33

4-
import org.junit.jupiter.api.Assertions;
5-
import org.junit.jupiter.api.Test;
6-
import org.scijava.testutil.ExampleTypes;
7-
8-
import java.io.*;
4+
import static org.junit.jupiter.api.Assertions.assertEquals;
5+
import static org.junit.jupiter.api.Assertions.assertFalse;
6+
import static org.junit.jupiter.api.Assertions.assertNull;
7+
import static org.junit.jupiter.api.Assertions.assertSame;
8+
import static org.junit.jupiter.api.Assertions.assertTrue;
9+
import static org.junit.jupiter.api.Assertions.fail;
10+
11+
import java.io.File;
12+
import java.io.FileOutputStream;
13+
import java.io.IOException;
14+
import java.io.InputStream;
15+
import java.io.OutputStream;
916
import java.lang.reflect.Field;
1017
import java.lang.reflect.Method;
1118
import java.lang.reflect.TypeVariable;
@@ -15,12 +22,21 @@
1522
import java.net.URL;
1623
import java.net.URLClassLoader;
1724
import java.nio.file.Files;
18-
import java.util.*;
25+
import java.util.ArrayList;
26+
import java.util.Collection;
27+
import java.util.HashMap;
28+
import java.util.HashSet;
29+
import java.util.LinkedList;
30+
import java.util.List;
31+
import java.util.Map;
32+
import java.util.Objects;
33+
import java.util.Set;
1934
import java.util.jar.JarOutputStream;
2035
import java.util.zip.ZipEntry;
2136

22-
import static org.junit.jupiter.api.Assertions.*;
23-
import static org.junit.jupiter.api.Assertions.assertEquals;
37+
import org.junit.jupiter.api.Assertions;
38+
import org.junit.jupiter.api.Test;
39+
import org.scijava.testutil.ExampleTypes;
2440

2541
/**
2642
* Tests {@link Classes}

‎scijava/scijava-discovery-therapi/src/main/java/org/scijava/discovery/therapi/TherapiDiscoverer.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@
33

44
import java.io.File;
55
import java.io.IOException;
6-
import java.util.*;
6+
import java.util.ArrayList;
7+
import java.util.Arrays;
8+
import java.util.Collections;
9+
import java.util.Enumeration;
10+
import java.util.HashMap;
11+
import java.util.List;
12+
import java.util.Map;
13+
import java.util.Optional;
714
import java.util.jar.JarEntry;
815
import java.util.jar.JarFile;
916
import java.util.stream.Collectors;

‎scijava/scijava-discovery-therapi/src/main/java/org/scijava/discovery/therapi/TherapiDiscoveryUtils.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,22 @@
33
import java.lang.reflect.AnnotatedElement;
44
import java.lang.reflect.Field;
55
import java.lang.reflect.Method;
6-
import java.util.*;
6+
import java.util.ArrayList;
7+
import java.util.Arrays;
8+
import java.util.Collections;
9+
import java.util.HashMap;
10+
import java.util.List;
11+
import java.util.Map;
12+
import java.util.Optional;
713
import java.util.stream.Collectors;
814

915
import org.scijava.parse2.Parser;
1016

11-
import com.github.therapi.runtimejavadoc.*;
17+
import com.github.therapi.runtimejavadoc.BaseJavadoc;
18+
import com.github.therapi.runtimejavadoc.ClassJavadoc;
19+
import com.github.therapi.runtimejavadoc.FieldJavadoc;
20+
import com.github.therapi.runtimejavadoc.MethodJavadoc;
21+
import com.github.therapi.runtimejavadoc.RuntimeJavadoc;
1222

1323
/**
1424
* Utilities for discovery using Therapi

‎scijava/scijava-discovery/src/main/java/org/scijava/discovery/Discoverer.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
package org.scijava.discovery;
22

33
import java.lang.reflect.Type;
4-
import java.util.*;
4+
import java.util.ArrayList;
5+
import java.util.Arrays;
6+
import java.util.Collection;
7+
import java.util.Collections;
8+
import java.util.List;
9+
import java.util.ServiceConfigurationError;
10+
import java.util.ServiceLoader;
511
import java.util.function.Function;
612
import java.util.stream.Collectors;
713
import java.util.stream.Stream;

‎scijava/scijava-discovery/src/main/java/org/scijava/discovery/ManualDiscoverer.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11

22
package org.scijava.discovery;
33

4-
import java.util.*;
4+
import java.util.HashSet;
5+
import java.util.List;
6+
import java.util.Set;
57
import java.util.stream.Collectors;
68

79
/**

‎scijava/scijava-log2/src/test/java/org/scijava/log2/DefaultLoggerTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929

3030
package org.scijava.log2;
3131

32-
import static org.junit.jupiter.api.Assertions.*;
32+
import static org.junit.jupiter.api.Assertions.assertEquals;
33+
import static org.junit.jupiter.api.Assertions.assertFalse;
34+
import static org.junit.jupiter.api.Assertions.assertTrue;
3335

3436
import java.util.Arrays;
3537
import java.util.List;

‎scijava/scijava-log2/src/test/java/org/scijava/log2/LogSourceTest.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,15 @@
2929

3030
package org.scijava.log2;
3131

32-
import org.junit.jupiter.api.Test;
32+
import static org.junit.jupiter.api.Assertions.assertEquals;
33+
import static org.junit.jupiter.api.Assertions.assertFalse;
34+
import static org.junit.jupiter.api.Assertions.assertSame;
35+
import static org.junit.jupiter.api.Assertions.assertTrue;
3336

3437
import java.util.Collections;
3538

36-
import static org.junit.jupiter.api.Assertions.*;
39+
import org.junit.jupiter.api.Test;
40+
3741

3842
/**
3943
* Tests {@link LogSource}

‎scijava/scijava-ops-engine/src/main/java/org/scijava/ops/engine/OpUtils.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131

3232
import java.lang.reflect.Method;
3333
import java.lang.reflect.Type;
34-
import java.util.*;
34+
import java.util.Arrays;
35+
import java.util.List;
36+
import java.util.Optional;
3537
import java.util.stream.Collectors;
3638

3739
import org.scijava.ops.api.OpCandidate;

0 commit comments

Comments
 (0)