Skip to content

Commit 4005709

Browse files
committed
Cleanup imports and minor API tweaks
Remove and reorder unused imports across modules, tidy test import ordering, and apply small API tweaks. Notable changes: remove ListUtils.newLinkedList (and its Javadoc), switch Converters cache value type from ArrayList to List, adjust annotation meta imports (Nonnull/Nullable/ThreadSafe/NotThreadSafe), and other minor import/whitespace cleanups in annotation-processor, java-core, java-annotations and tests.
1 parent abbbbcf commit 4005709

260 files changed

Lines changed: 631 additions & 584 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

microsphere-annotation-processor/src/main/java/io/microsphere/annotation/processor/ConfigurationPropertyAnnotationProcessor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
import io.microsphere.json.JSONArray;
2323
import io.microsphere.metadata.ConfigurationPropertyGenerator;
2424

25-
import java.util.Iterator;
26-
import java.util.List;
27-
import java.util.Set;
2825
import javax.annotation.processing.AbstractProcessor;
2926
import javax.annotation.processing.Messager;
3027
import javax.annotation.processing.ProcessingEnvironment;
@@ -34,6 +31,9 @@
3431
import javax.lang.model.SourceVersion;
3532
import javax.lang.model.element.Element;
3633
import javax.lang.model.element.TypeElement;
34+
import java.util.Iterator;
35+
import java.util.List;
36+
import java.util.Set;
3737

3838
import static io.microsphere.annotation.processor.ConfigurationPropertyJSONElementVisitor.CONFIGURATION_PROPERTY_ANNOTATION_CLASS_NAME;
3939
import static io.microsphere.constants.ResourceConstants.CONFIGURATION_PROPERTY_METADATA_RESOURCE;

microsphere-annotation-processor/src/main/java/io/microsphere/annotation/processor/ConfigurationPropertyJSONElementVisitor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import io.microsphere.lang.model.util.AnnotatedElementJSONElementVisitor;
2323
import io.microsphere.metadata.ConfigurationPropertyGenerator;
2424

25-
import java.util.List;
26-
import java.util.Map;
2725
import javax.annotation.processing.ProcessingEnvironment;
2826
import javax.lang.model.element.AnnotationMirror;
2927
import javax.lang.model.element.AnnotationValue;
@@ -32,6 +30,8 @@
3230
import javax.lang.model.element.TypeElement;
3331
import javax.lang.model.element.VariableElement;
3432
import javax.lang.model.type.TypeMirror;
33+
import java.util.List;
34+
import java.util.Map;
3535

3636
import static io.microsphere.constants.SymbolConstants.COMMA_CHAR;
3737
import static io.microsphere.lang.model.util.AnnotationUtils.getAnnotation;

microsphere-annotation-processor/src/main/java/io/microsphere/annotation/processor/FilerProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
import io.microsphere.lang.function.ThrowableFunction;
2121

22-
import java.util.function.BiFunction;
2322
import javax.annotation.processing.Filer;
2423
import javax.annotation.processing.ProcessingEnvironment;
2524
import javax.tools.JavaFileManager;
25+
import java.util.function.BiFunction;
2626

2727
import static io.microsphere.lang.model.util.MessagerUtils.printMandatoryWarning;
2828
import static io.microsphere.reflect.FieldUtils.getFieldValue;

microsphere-annotation-processor/src/main/java/io/microsphere/annotation/processor/ResourceProcessor.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,18 @@
2020
import io.microsphere.lang.function.ThrowableConsumer;
2121
import io.microsphere.lang.function.ThrowableFunction;
2222

23+
import javax.annotation.processing.ProcessingEnvironment;
24+
import javax.tools.FileObject;
25+
import javax.tools.JavaFileManager.Location;
2326
import java.io.InputStream;
2427
import java.io.OutputStream;
2528
import java.io.Reader;
2629
import java.io.Writer;
27-
import java.util.HashMap;
2830
import java.util.Map;
2931
import java.util.Optional;
3032
import java.util.function.BiConsumer;
3133
import java.util.function.BiFunction;
3234
import java.util.function.Function;
33-
import javax.annotation.processing.ProcessingEnvironment;
34-
import javax.tools.FileObject;
35-
import javax.tools.JavaFileManager.Location;
3635

3736
import static io.microsphere.collection.MapUtils.newHashMap;
3837
import static io.microsphere.lang.model.util.MessagerUtils.printNote;

microsphere-annotation-processor/src/test/java/io/microsphere/annotation/processor/ConfigurationPropertyJSONElementVisitorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import io.microsphere.reflect.TypeUtils;
2626
import io.microsphere.test.annotation.processing.AbstractAnnotationProcessingTest;
2727
import io.microsphere.util.ServiceLoaderUtils;
28+
import org.junit.jupiter.api.Test;
2829

2930
import java.util.Set;
30-
import org.junit.jupiter.api.Test;
3131

3232
import static io.microsphere.annotation.processor.ConfigurationPropertyJSONElementVisitor.CONFIGURATION_PROPERTY_ANNOTATION_CLASS_NAME;
3333
import static org.junit.jupiter.api.Assertions.assertEquals;

microsphere-annotation-processor/src/test/java/io/microsphere/annotation/processor/FilerProcessorTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
package io.microsphere.annotation.processor;
1919

2020
import io.microsphere.test.annotation.processing.AbstractAnnotationProcessingTest;
21-
22-
import java.lang.reflect.Method;
23-
import javax.tools.JavaFileManager;
24-
import javax.tools.JavaFileObject;
2521
import org.junit.jupiter.api.Test;
2622
import org.junit.jupiter.api.extension.ExtensionContext;
2723
import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
2824

25+
import javax.tools.JavaFileManager;
26+
import javax.tools.JavaFileObject;
27+
import java.lang.reflect.Method;
28+
2929
import static io.microsphere.annotation.processor.ResourceProcessor.exists;
3030
import static org.junit.jupiter.api.Assertions.assertFalse;
3131
import static org.junit.jupiter.api.Assertions.assertNotNull;

microsphere-annotation-processor/src/test/java/io/microsphere/annotation/processor/ResourceProcessorTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
package io.microsphere.annotation.processor;
1919

2020
import io.microsphere.test.annotation.processing.AbstractAnnotationProcessingTest;
21-
22-
import java.lang.reflect.Method;
23-
import java.util.Optional;
24-
import javax.tools.FileObject;
2521
import org.junit.jupiter.api.Test;
2622
import org.junit.jupiter.api.extension.ExtensionContext;
2723
import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
2824

25+
import javax.tools.FileObject;
26+
import java.lang.reflect.Method;
27+
import java.util.Optional;
28+
2929
import static io.microsphere.annotation.processor.ResourceProcessor.FOR_READING;
3030
import static io.microsphere.annotation.processor.ResourceProcessor.FOR_WRITING;
3131
import static io.microsphere.annotation.processor.ResourceProcessor.exists;

microsphere-annotation-processor/src/test/java/io/microsphere/annotation/processor/TestConfigurationPropertyLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package io.microsphere.annotation.processor;
1919

20-
import io.microsphere.beans.ConfigurationProperty.Metadata;
2120
import io.microsphere.beans.ConfigurationProperty;
21+
import io.microsphere.beans.ConfigurationProperty.Metadata;
2222
import io.microsphere.metadata.ConfigurationPropertyLoader;
2323

2424
import java.util.ArrayList;

microsphere-java-annotations/src/main/java/io/microsphere/annotation/Nonnull.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package io.microsphere.annotation;
1818

19+
import javax.annotation.meta.TypeQualifierNickname;
1920
import java.lang.annotation.Documented;
2021
import java.lang.annotation.Retention;
21-
import javax.annotation.meta.TypeQualifierNickname;
2222

2323
import static java.lang.annotation.RetentionPolicy.RUNTIME;
2424

microsphere-java-annotations/src/main/java/io/microsphere/annotation/Nullable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package io.microsphere.annotation;
1818

19+
import javax.annotation.meta.TypeQualifierNickname;
1920
import java.lang.annotation.Documented;
2021
import java.lang.annotation.Retention;
21-
import javax.annotation.meta.TypeQualifierNickname;
2222

2323
import static java.lang.annotation.RetentionPolicy.RUNTIME;
2424
import static javax.annotation.meta.When.MAYBE;

0 commit comments

Comments
 (0)