Skip to content

Commit c8da319

Browse files
committed
Organize imports and standardize collection utils
Refactor: reorganize imports across multiple core classes to consistently use static factory helpers from io.microsphere.collection (e.g. newArrayList, newLinkedList, newLinkedHashSet, newTreeSet). Removed some unused concrete collection imports (ArrayList, LinkedList, TreeSet) and adjusted static import placement for clarity. Updated a unit test import ordering (SetUtilsTest). These are non-functional cleanup changes to improve consistency and readability; no behavioral changes intended.
1 parent e73327b commit c8da319

17 files changed

Lines changed: 16 additions & 24 deletions

microsphere-java-core/src/main/java/io/microsphere/classloading/ArtifactDetector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import static io.microsphere.collection.CollectionUtils.size;
1717
import static io.microsphere.collection.ListUtils.newArrayList;
18+
import static io.microsphere.collection.SetUtils.newLinkedHashSet;
1819
import static io.microsphere.logging.LoggerFactory.getLogger;
1920
import static io.microsphere.util.ClassLoaderUtils.findAllClassPathURLs;
2021
import static io.microsphere.util.ClassLoaderUtils.getClassLoader;
@@ -25,7 +26,6 @@
2526
import static io.microsphere.util.SystemUtils.JAVA_HOME;
2627
import static java.util.Collections.emptyList;
2728
import static java.util.Collections.unmodifiableList;
28-
import static io.microsphere.collection.SetUtils.newLinkedHashSet;
2929

3030
/**
3131
* The {@code ArtifactDetector} class is responsible for detecting and resolving artifacts from the classpath.

microsphere-java-core/src/main/java/io/microsphere/classloading/BannedArtifactClassLoadingExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
import java.util.LinkedList;
1313
import java.util.List;
1414

15+
import static io.microsphere.collection.ListUtils.newLinkedList;
1516
import static io.microsphere.constants.SymbolConstants.COLON;
1617
import static io.microsphere.logging.LoggerFactory.getLogger;
1718
import static io.microsphere.util.ClassLoaderUtils.removeClassPathURL;
1819
import static io.microsphere.util.StringUtils.isBlank;
1920
import static io.microsphere.util.StringUtils.split;
2021
import static io.microsphere.util.SystemUtils.FILE_ENCODING;
21-
import static io.microsphere.collection.ListUtils.newLinkedList;
2222

2323
/**
2424
* The executor for the banned artifacts that are loading by {@link ClassLoader}.

microsphere-java-core/src/main/java/io/microsphere/collection/SetUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import java.util.Set;
3131
import java.util.SortedSet;
3232
import java.util.TreeSet;
33-
import java.util.concurrent.CopyOnWriteArraySet;
3433
import java.util.concurrent.ConcurrentSkipListSet;
34+
import java.util.concurrent.CopyOnWriteArraySet;
3535

3636
import static io.microsphere.collection.CollectionUtils.size;
3737
import static io.microsphere.collection.MapUtils.FIXED_LOAD_FACTOR;

microsphere-java-core/src/main/java/io/microsphere/event/AbstractEventDispatcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.util.function.Predicate;
3232
import java.util.stream.Stream;
3333

34+
import static io.microsphere.collection.ListUtils.newLinkedList;
3435
import static io.microsphere.collection.MapUtils.newConcurrentHashMap;
3536
import static io.microsphere.event.EventListener.findEventType;
3637
import static io.microsphere.lang.function.ThrowableAction.execute;
@@ -40,7 +41,6 @@
4041
import static io.microsphere.util.ServiceLoaderUtils.loadServicesList;
4142
import static java.util.Collections.sort;
4243
import static java.util.Collections.unmodifiableList;
43-
import static io.microsphere.collection.ListUtils.newLinkedList;
4444

4545
/**
4646
* Abstract implementation of {@link EventDispatcher} that provides common functionality for dispatching events to

microsphere-java-core/src/main/java/io/microsphere/event/GenericEventListener.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@
2121

2222
import java.lang.reflect.Method;
2323
import java.util.HashMap;
24-
import java.util.LinkedHashSet;
2524
import java.util.Map;
2625
import java.util.Set;
2726

2827
import static io.microsphere.collection.MapUtils.newHashMap;
28+
import static io.microsphere.collection.SetUtils.newLinkedHashSet;
2929
import static io.microsphere.lang.function.ThrowableConsumer.execute;
3030
import static java.util.Collections.emptySet;
3131
import static java.util.stream.Stream.of;
32-
import static io.microsphere.collection.SetUtils.newLinkedHashSet;
3332

3433
/**
3534
* A generic implementation of the {@link EventListener} interface that supports multiple event handling methods.

microsphere-java-core/src/main/java/io/microsphere/event/Listenable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
import java.util.List;
2323

2424
import static io.microsphere.collection.CollectionUtils.addAll;
25+
import static io.microsphere.collection.ListUtils.newArrayList;
2526
import static io.microsphere.text.FormatUtils.format;
2627
import static io.microsphere.util.Assert.assertNotNull;
2728
import static io.microsphere.util.ClassUtils.getTypeName;
2829
import static java.lang.reflect.Modifier.isFinal;
2930
import static java.util.stream.StreamSupport.stream;
30-
import static io.microsphere.collection.ListUtils.newArrayList;
3131

3232
/**
3333
* A component that allows registration and management of {@link EventListener} instances.

microsphere-java-core/src/main/java/io/microsphere/filter/FilterUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import java.util.Iterator;
1212
import java.util.List;
1313

14-
import static java.util.Collections.unmodifiableList;
1514
import static io.microsphere.collection.ListUtils.newArrayList;
15+
import static java.util.Collections.unmodifiableList;
1616

1717
/**
1818
* Utility class for working with {@link Filter} instances.

microsphere-java-core/src/main/java/io/microsphere/io/StandardFileWatchService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
import java.nio.file.Watchable;
3434
import java.util.Map;
3535
import java.util.Set;
36-
import java.util.TreeSet;
3736
import java.util.concurrent.Executor;
3837
import java.util.concurrent.ExecutorService;
3938
import java.util.concurrent.Future;
4039
import java.util.concurrent.atomic.AtomicBoolean;
4140

4241
import static io.microsphere.annotation.ConfigurationProperty.SYSTEM_PROPERTIES_SOURCE;
4342
import static io.microsphere.collection.MapUtils.newTreeMap;
43+
import static io.microsphere.collection.SetUtils.newTreeSet;
4444
import static io.microsphere.concurrent.CustomizedThreadFactory.newThreadFactory;
4545
import static io.microsphere.concurrent.ExecutorUtils.shutdown;
4646
import static io.microsphere.concurrent.ExecutorUtils.shutdownOnExit;
@@ -63,7 +63,6 @@
6363
import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
6464
import static java.util.concurrent.Executors.newSingleThreadExecutor;
6565
import static java.util.concurrent.TimeUnit.MILLISECONDS;
66-
import static io.microsphere.collection.SetUtils.newTreeSet;
6766

6867
/**
6968
* /**

microsphere-java-core/src/main/java/io/microsphere/json/JSONArray.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.microsphere.json.JSONStringer.Scope;
2020

2121
import java.lang.reflect.Array;
22-
import java.util.ArrayList;
2322
import java.util.Enumeration;
2423
import java.util.List;
2524

microsphere-java-core/src/main/java/io/microsphere/json/JSONObject.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
import io.microsphere.json.JSONStringer.Scope;
2020

21-
import java.util.ArrayList;
2221
import java.util.Enumeration;
2322
import java.util.Iterator;
2423
import java.util.Map;
2524

2625
import static io.microsphere.beans.BeanUtils.resolvePropertiesAsMap;
2726
import static io.microsphere.collection.EnumerationUtils.isEnumeration;
27+
import static io.microsphere.collection.ListUtils.newArrayList;
2828
import static io.microsphere.collection.MapUtils.isMap;
2929
import static io.microsphere.collection.MapUtils.newLinkedHashMap;
3030
import static io.microsphere.json.JSON.checkDouble;
@@ -43,7 +43,6 @@
4343
import static io.microsphere.util.ClassUtils.isEnum;
4444
import static io.microsphere.util.ClassUtils.isNumber;
4545
import static io.microsphere.util.ClassUtils.isWrapperType;
46-
import static io.microsphere.collection.ListUtils.newArrayList;
4746

4847
/**
4948
* A modifiable set of name/value mappings. Names are unique, non-null strings. Values may

0 commit comments

Comments
 (0)