Merge pull request #248 from microsphere-projects/dev

Release 0.1.8

Author: mercyblitz

.github/workflows/maven-build.yml

@@ -22,21 +22,21 @@ jobs:
         java: [ '8', '11' , '17' , '21' , '25' ]
     steps:
       - name: Checkout Source
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup JDK ${{ matrix.Java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
-          cache: maven
 
       - name: Build with Maven
-        run: mvn
+        run: ./mvnw
           --batch-mode
           --update-snapshots
           --file pom.xml
           -Drevision=0.0.1-SNAPSHOT
+          -Dsurefire.useSystemClassLoader=false
           test
           --activate-profiles test,coverage
 

.github/workflows/maven-publish.yml

@@ -24,10 +24,10 @@ jobs:
     if: ${{ inputs.revision }}
     steps:
       - name: Checkout Source
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Maven Central Repository
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '11'
           distribution: 'temurin'

.mvn/wrapper/maven-wrapper.jar

@@ -1,16 +1,3 @@
-# Copyright 2013-2023 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://maven.aliyun.com/repository/public/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

.mvn/wrapper/maven-wrapper.properties

@@ -37,23 +37,30 @@ frameworks like Spring, making it a versatile addition to any Java developer's t
 - JMX
 - Versioning
 - Annotation processing
+- Tools
+- Testing
 
 ## Modules
 
 The framework is organized into several key modules:
 
- Module                           | Purpose                                                                                         
-----------------------------------|-------------------------------------------------------------------------------------------------
- microsphere-java-core            | Provides core utilities across various domains like annotations, collections, concurrency, etc. 
- microsphere-annotation-processor | Offers annotation processing capabilities for compile-time code generation                      
- microsphere-java-dependencies    | Manages dependency versions across the project                                                  
- microsphere-java-parent          | Parent POM with shared configurations                                                           
+ Module                           | Purpose                                                                                             
+----------------------------------|-----------------------------------------------------------------------------------------------------
+ microsphere-java-annotations     | Provides the common annotations for Microsphere Java projects.                                      
+ microsphere-java-core            | Provides the core utilities across various domains like annotations, collections, concurrency, etc. 
+ microsphere-java-model           | Provides the components and utilities across Java Language Model API.                               
+ microsphere-jdk-tools            | Offers the components for Java tools.                                                               
+ microsphere-annotation-processor | Offers annotation processing capabilities for compile-time code generation.                         
+ microsphere-java-test            | Provides the models and components for Java testing.                                                
+ microsphere-java-dependencies    | Manages dependency versions across the project.                                                     
+ microsphere-java-parent          | Parent POM with shared configurations.                                                              
 
 ## Getting Started
 
 The easiest way to get started is by adding the Microsphere Java BOM (Bill of Materials) to your project's pom.xml:
 
 ```xml
+
 <dependencyManagement>
     <dependencies>
         ...
@@ -73,6 +80,7 @@ The easiest way to get started is by adding the Microsphere Java BOM (Bill of Ma
 Then add the specific modules you need:
 
 ```xml
+
 <dependencies>
     <!-- Core utilities -->
     <dependency>
@@ -159,8 +167,12 @@ We welcome your contributions! Please read [Code of Conduct](./CODE_OF_CONDUCT.m
 
 ### JavaDoc
 
+- [microsphere-java-annotations](https://javadoc.io/doc/io.github.microsphere-projects/microsphere-java-annotations)
 - [microsphere-java-core](https://javadoc.io/doc/io.github.microsphere-projects/microsphere-java-core)
+- [microsphere-java-model](https://javadoc.io/doc/io.github.microsphere-projects/microsphere-java-model)
+- [microsphere-jdk-tools](https://javadoc.io/doc/io.github.microsphere-projects/microsphere-jdk-tools)
 - [microsphere-annotation-processor](https://javadoc.io/doc/io.github.microsphere-projects/microsphere-annotation-processor)
+- [microsphere-java-test](https://javadoc.io/doc/io.github.microsphere-projects/microsphere-java-test)
 
 ## License
 

README.md

@@ -18,11 +18,6 @@
     <name>Microsphere :: Java :: Annotation Processor</name>
     <description>Microsphere Annotation Processor</description>
 
-    <properties>
-        <javax.ws.rs.version>2.1</javax.ws.rs.version>
-        <jaxws-api.version>2.3.1</jaxws-api.version>
-    </properties>
-
     <dependencies>
 
         <!-- Microsphere Java Core -->
@@ -32,6 +27,13 @@
             <version>${revision}</version>
         </dependency>
 
+        <!-- Microsphere Language Model -->
+        <dependency>
+            <groupId>io.github.microsphere-projects</groupId>
+            <artifactId>microsphere-lang-model</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
         <!-- Testing -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -45,6 +47,22 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- Microsphere JDK Tools -->
+        <dependency>
+            <groupId>io.github.microsphere-projects</groupId>
+            <artifactId>microsphere-jdk-tools</artifactId>
+            <version>${revision}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Microsphere Java Test -->
+        <dependency>
+            <groupId>io.github.microsphere-projects</groupId>
+            <artifactId>microsphere-java-test</artifactId>
+            <version>${revision}</version>
+            <scope>test</scope>
+        </dependency>
+
         <!-- Logback -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -56,15 +74,13 @@
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
-            <version>${javax.ws.rs.version}</version>
             <scope>test</scope>
         </dependency>
 
         <!-- JAX-WS API-->
         <dependency>
             <groupId>javax.xml.ws</groupId>
             <artifactId>jaxws-api</artifactId>
-            <version>${jaxws-api.version}</version>
             <scope>test</scope>
         </dependency>
 

microsphere-annotation-processor/pom.xml

@@ -18,7 +18,7 @@
 package io.microsphere.annotation.processor;
 
 import io.microsphere.annotation.ConfigurationProperty;
-import io.microsphere.annotation.processor.model.util.ConfigurationPropertyJSONElementVisitor;
+import io.microsphere.constants.ResourceConstants;
 import io.microsphere.json.JSONArray;
 import io.microsphere.metadata.ConfigurationPropertyGenerator;
 
@@ -35,12 +35,12 @@
 import java.util.List;
 import java.util.Set;
 
-import static io.microsphere.annotation.processor.model.util.ConfigurationPropertyJSONElementVisitor.CONFIGURATION_PROPERTY_ANNOTATION_CLASS_NAME;
-import static io.microsphere.annotation.processor.util.MessagerUtils.printNote;
+import static io.microsphere.annotation.processor.ConfigurationPropertyJSONElementVisitor.CONFIGURATION_PROPERTY_ANNOTATION_CLASS_NAME;
 import static io.microsphere.constants.ResourceConstants.CONFIGURATION_PROPERTY_METADATA_RESOURCE;
 import static io.microsphere.constants.SymbolConstants.COMMA_CHAR;
 import static io.microsphere.constants.SymbolConstants.LEFT_SQUARE_BRACKET_CHAR;
 import static io.microsphere.constants.SymbolConstants.RIGHT_SQUARE_BRACKET_CHAR;
+import static io.microsphere.lang.model.util.MessagerUtils.printNote;
 import static io.microsphere.metadata.ConfigurationPropertyLoader.loadAll;
 import static javax.lang.model.SourceVersion.latestSupported;
 import static javax.tools.StandardLocation.CLASS_OUTPUT;
@@ -62,7 +62,7 @@
  *     </li>
  *     <li>{@link #resolveMetadata(RoundEnvironment)} traverses all root elements to extract configuration property metadata.</li>
  *     <li>{@link #writeMetadata()} writes the generated metadata into a JSON file under
- *         {@value #CONFIGURATION_PROPERTY_METADATA_RESOURCE_NAME} using a writer.</li>
+ *         {@value ResourceConstants#CONFIGURATION_PROPERTY_METADATA_RESOURCE} using a writer.</li>
  * </ul>
  *
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
@@ -106,24 +106,28 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
     private void resolveMetadata(RoundEnvironment roundEnv) {
         Set<? extends Element> elements = roundEnv.getRootElements();
-        if (!elements.isEmpty()) {
+        resolveMetadata(elements);
+    }
+
+    void resolveMetadata(Set<? extends Element> elements) {
+        jsonBuilder.append(LEFT_SQUARE_BRACKET_CHAR);
 
+        // Resolve the content
+        if (!elements.isEmpty()) {
             Iterator<? extends Element> iterator = elements.iterator();
-            jsonBuilder.append(LEFT_SQUARE_BRACKET_CHAR);
             while (iterator.hasNext()) {
                 Element element = iterator.next();
                 element.accept(jsonElementVisitor, jsonBuilder);
             }
-
             // append the JSON content generated by ConfigurationPropertyGenerator SPI
             appendGeneratedConfigurationPropertyJSON(jsonBuilder);
+        }
 
-            int lastIndex = jsonBuilder.length() - 1;
-            if (COMMA_CHAR == jsonBuilder.charAt(lastIndex)) {
-                jsonBuilder.setCharAt(lastIndex, RIGHT_SQUARE_BRACKET_CHAR);
-            } else {
-                jsonBuilder.append(RIGHT_SQUARE_BRACKET_CHAR);
-            }
+        int lastIndex = jsonBuilder.length() - 1;
+        if (COMMA_CHAR == jsonBuilder.charAt(lastIndex)) {
+            jsonBuilder.setCharAt(lastIndex, RIGHT_SQUARE_BRACKET_CHAR);
+        } else {
+            jsonBuilder.append(RIGHT_SQUARE_BRACKET_CHAR);
         }
     }
 
@@ -151,9 +155,12 @@ private void writeMetadata() {
         });
     }
 
+    String toJSON() {
+        return jsonBuilder.toString();
+    }
+
     @Override
     public SourceVersion getSupportedSourceVersion() {
         return latestSupported();
     }
 }
- 

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

@@ -15,29 +15,31 @@
  * limitations under the License.
  */
 
-package io.microsphere.annotation.processor.model.util;
+package io.microsphere.annotation.processor;
 
 import io.microsphere.annotation.ConfigurationProperty;
 import io.microsphere.beans.ConfigurationProperty.Metadata;
+import io.microsphere.lang.model.util.AnnotatedElementJSONElementVisitor;
 import io.microsphere.metadata.ConfigurationPropertyGenerator;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 import java.util.List;
 import java.util.Map;
 
-import static io.microsphere.annotation.processor.util.AnnotationUtils.getAnnotation;
-import static io.microsphere.annotation.processor.util.AnnotationUtils.getAttributeName;
-import static io.microsphere.annotation.processor.util.AnnotationUtils.getElementValues;
-import static io.microsphere.annotation.processor.util.AnnotationUtils.matchesDefaultAttributeValue;
-import static io.microsphere.annotation.processor.util.ClassUtils.getClassName;
-import static io.microsphere.annotation.processor.util.TypeUtils.getTypeName;
 import static io.microsphere.constants.SymbolConstants.COMMA_CHAR;
+import static io.microsphere.lang.model.util.AnnotationUtils.getAnnotation;
+import static io.microsphere.lang.model.util.AnnotationUtils.getAttributeName;
+import static io.microsphere.lang.model.util.AnnotationUtils.getElementValues;
+import static io.microsphere.lang.model.util.AnnotationUtils.matchesDefaultAttributeValue;
+import static io.microsphere.lang.model.util.ClassUtils.getClassName;
+import static io.microsphere.lang.model.util.TypeUtils.getTypeName;
 import static io.microsphere.util.ServiceLoaderUtils.loadFirstService;
 import static io.microsphere.util.StringUtils.isBlank;
 
@@ -51,13 +53,13 @@
  * @see io.microsphere.beans.ConfigurationProperty
  * @since 1.0.0
  */
-public class ConfigurationPropertyJSONElementVisitor extends AnnotatedElementJSONElementVisitor {
+class ConfigurationPropertyJSONElementVisitor extends AnnotatedElementJSONElementVisitor {
 
-    public static final String CONFIGURATION_PROPERTY_ANNOTATION_CLASS_NAME = "io.microsphere.annotation.ConfigurationProperty";
+    static final String CONFIGURATION_PROPERTY_ANNOTATION_CLASS_NAME = "io.microsphere.annotation.ConfigurationProperty";
 
     private final ConfigurationPropertyGenerator generator;
 
-    public ConfigurationPropertyJSONElementVisitor(ProcessingEnvironment processingEnv) {
+    ConfigurationPropertyJSONElementVisitor(ProcessingEnvironment processingEnv) {
         super(processingEnv, CONFIGURATION_PROPERTY_ANNOTATION_CLASS_NAME);
         this.generator = loadFirstService(ConfigurationPropertyGenerator.class);
     }
@@ -87,8 +89,8 @@ public Boolean visitVariableAsField(VariableElement field, StringBuilder jsonBui
                 } else if ("description".equals(attributeName)) {
                     String description = resolveDescription(field, attributeMethod, annotationValue);
                     configurationProperty.setDescription(description);
-                } else if ("source".equals(attributeName)) {
-                    setSources(configurationProperty, annotationValue);
+                } else {
+                    setSources(configurationProperty, attributeName, annotationValue);
                 }
             }
             setDeclaredClass(configurationProperty, field);
@@ -102,6 +104,11 @@ public Boolean visitVariableAsField(VariableElement field, StringBuilder jsonBui
         return false;
     }
 
+    @Override
+    protected boolean supportsType(TypeElement e) {
+        return true;
+    }
+
     public ConfigurationPropertyGenerator getGenerator() {
         return generator;
     }
@@ -130,12 +137,14 @@ private String resolveStringValue(ExecutableElement attributeMethod, AnnotationV
         return (String) value;
     }
 
-    private void setSources(io.microsphere.beans.ConfigurationProperty configurationProperty, AnnotationValue annotationValue) {
-        List<? extends AnnotationValue> sources = (List<? extends AnnotationValue>) annotationValue.getValue();
-        Metadata metadata = configurationProperty.getMetadata();
-        for (AnnotationValue source : sources) {
-            String sourceValue = (String) source.getValue();
-            metadata.getSources().add(sourceValue);
+    void setSources(io.microsphere.beans.ConfigurationProperty configurationProperty, String attributeName, AnnotationValue annotationValue) {
+        if ("source".equals(attributeName)) {
+            List<? extends AnnotationValue> sources = (List<? extends AnnotationValue>) annotationValue.getValue();
+            Metadata metadata = configurationProperty.getMetadata();
+            for (AnnotationValue source : sources) {
+                String sourceValue = (String) source.getValue();
+                metadata.getSources().add(sourceValue);
+            }
         }
     }
 
@@ -149,5 +158,4 @@ private void setDeclaredField(io.microsphere.beans.ConfigurationProperty configu
         String declaredFieldName = field.getSimpleName().toString();
         configurationProperty.getMetadata().setDeclaredField(declaredFieldName);
     }
-
-}
+}

…igurationPropertyJSONElementVisitor.java …igurationPropertyJSONElementVisitor.javamicrosphere-annotation-processor/src/main/java/io/microsphere/annotation/processor/model/util/ConfigurationPropertyJSONElementVisitor.java renamed to microsphere-annotation-processor/src/main/java/io/microsphere/annotation/processor/ConfigurationPropertyJSONElementVisitor.java microsphere-annotation-processor/src/main/java/io/microsphere/annotation/processor/model/util/ConfigurationPropertyJSONElementVisitor.java renamed to microsphere-annotation-processor/src/main/java/io/microsphere/annotation/processor/ConfigurationPropertyJSONElementVisitor.java

@@ -24,7 +24,7 @@
 import javax.tools.JavaFileManager;
 import java.util.function.BiFunction;
 
-import static io.microsphere.annotation.processor.util.MessagerUtils.printMandatoryWarning;
+import static io.microsphere.lang.model.util.MessagerUtils.printMandatoryWarning;
 import static io.microsphere.reflect.FieldUtils.getFieldValue;
 
 /**

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

@@ -34,8 +34,8 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-import static io.microsphere.annotation.processor.util.MessagerUtils.printNote;
-import static io.microsphere.annotation.processor.util.MessagerUtils.printWarning;
+import static io.microsphere.lang.model.util.MessagerUtils.printNote;
+import static io.microsphere.lang.model.util.MessagerUtils.printWarning;
 import static io.microsphere.util.ExceptionUtils.wrap;
 import static java.util.Optional.empty;
 import static java.util.Optional.of;