Skip to content

Commit e45a223

Browse files
chore: merge main into release [skip ci]
2 parents 98c069b + d475a3b commit e45a223

748 files changed

Lines changed: 975 additions & 887 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,4 @@ String toJSON() {
163163
public SourceVersion getSupportedSourceVersion() {
164164
return latestSupported();
165165
}
166-
}
166+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,4 @@ private void setDeclaredField(io.microsphere.beans.ConfigurationProperty configu
158158
String declaredFieldName = field.getSimpleName().toString();
159159
configurationProperty.getMetadata().setDeclaredField(declaredFieldName);
160160
}
161-
}
161+
}

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
@@ -100,4 +100,4 @@ public JavaFileManager getJavaFileManager() {
100100
return processInFiler(filer -> getFieldValue(filer, "fileManager"));
101101
}
102102

103-
}
103+
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.io.OutputStream;
2828
import java.io.Reader;
2929
import java.io.Writer;
30-
import java.util.HashMap;
3130
import java.util.Map;
3231
import java.util.Optional;
3332
import java.util.function.BiConsumer;
@@ -244,4 +243,4 @@ public void processInResourceWriter(String resourceName, ThrowableConsumer<Write
244243
public static boolean exists(FileObject resource) {
245244
return resource != null && resource.getLastModified() > 0;
246245
}
247-
}
246+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package io.microsphere.annotation.processor;
1919

2020
import io.microsphere.test.annotation.processing.AbstractAnnotationProcessingTest;
21+
2122
import org.junit.jupiter.api.Test;
2223

2324
import static io.microsphere.util.Assert.assertNotNull;
@@ -40,4 +41,4 @@ void testResolveMetadataOnEmptySet() {
4041
String json = processor.toJSON();
4142
assertNotNull("[]", json);
4243
}
43-
}
44+
}

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
@@ -72,4 +72,4 @@ void testSetSourcesOnNoSource() {
7272
visitor.setSources(null, "noSource", null);
7373
assertNotNull(visitor);
7474
}
75-
}
75+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ void testGetJavaFileManager() {
6666
JavaFileManager javaFileManager = processor.getJavaFileManager();
6767
assertNotNull(javaFileManager);
6868
}
69-
}
69+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,4 +192,4 @@ void testProcessInResourceOnWriterOnFailed() {
192192
void testExistsOnNull() {
193193
assertFalse(exists(null));
194194
}
195-
}
195+
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io.microsphere.beans.ConfigurationProperty.Metadata;
2222
import io.microsphere.metadata.ConfigurationPropertyLoader;
2323

24+
import java.util.ArrayList;
2425
import java.util.List;
2526
import java.util.Random;
2627

@@ -40,7 +41,7 @@ public class TestConfigurationPropertyLoader implements ConfigurationPropertyLoa
4041
public List<ConfigurationProperty> load() throws Throwable {
4142

4243
int size = SIMPLE_TYPES.size();
43-
List<ConfigurationProperty> configurationProperties = newArrayList(size);
44+
ArrayList<ConfigurationProperty> configurationProperties = newArrayList(size);
4445

4546
Random random = new Random();
4647

@@ -68,4 +69,4 @@ public List<ConfigurationProperty> load() throws Throwable {
6869
}
6970
return configurationProperties;
7071
}
71-
}
72+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,4 @@
9494
*/
9595
String[] source() default {};
9696

97-
}
97+
}

0 commit comments

Comments
 (0)