move to unknow-model

pom.xml

@@ -384,6 +384,13 @@
 				<version>${protobuf.version}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>io.github.unknow0.model</groupId>
+				<artifactId>unknow-model-bom</artifactId>
+				<version>1.0.1</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson</groupId>
 				<artifactId>jackson-bom</artifactId>

unknow-server-maven/pom.xml

@@ -78,6 +78,23 @@
 			<artifactId>unknow-server-jaxrs</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>io.github.unknow0.model</groupId>
+			<artifactId>unknow-model-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.github.unknow0.model</groupId>
+			<artifactId>unknow-model-ast</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.github.unknow0.model</groupId>
+			<artifactId>unknow-model-jvm</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.github.unknow0.model</groupId>
+			<artifactId>unknow-model-simple</artifactId>
+			<scope>test</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>com.github.javaparser</groupId>

unknow-server-maven/src/main/java/unknow/server/maven/AbstractGeneratorMojo.java

@@ -52,10 +52,10 @@
 import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;
 
-import unknow.server.maven.model.ModelLoader;
-import unknow.server.maven.model.TypeModel;
-import unknow.server.maven.model.ast.AstModelLoader;
-import unknow.server.maven.model.jvm.JvmModelLoader;
+import unknow.model.api.ModelLoader;
+import unknow.model.api.TypeModel;
+import unknow.model.ast.AstModelLoader;
+import unknow.model.jvm.JvmModelLoader;
 
 /**
  * @author unknow

unknow-server-maven/src/main/java/unknow/server/maven/TypeCache.java

@@ -19,9 +19,9 @@
 import com.github.javaparser.ast.type.UnknownType;
 import com.github.javaparser.ast.type.WildcardType;
 
-import unknow.server.maven.model.ModelLoader;
-import unknow.server.maven.model.PrimitiveModel;
-import unknow.server.maven.model.TypeModel;
+import unknow.model.api.ModelLoader;
+import unknow.model.api.PrimitiveModel;
+import unknow.model.api.TypeModel;
 
 /**
  * @author unknow

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/HandlerContext.java

@@ -4,9 +4,9 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
+import unknow.model.api.ModelLoader;
+import unknow.model.api.TypeModel;
 import unknow.server.maven.jaxb.model.XmlType;
-import unknow.server.maven.model.ModelLoader;
-import unknow.server.maven.model.TypeModel;
 
 public class HandlerContext {
 	private final Map<XmlType, String> handlers;

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/JaxbGeneratorMojo.java

@@ -45,6 +45,8 @@
 
 import jakarta.xml.bind.JAXBContextFactory;
 import jakarta.xml.bind.annotation.XmlRootElement;
+import unknow.model.api.AnnotationModel;
+import unknow.model.api.TypeModel;
 import unknow.server.jaxb.ContextFactory;
 import unknow.server.jaxb.handler.BigDecimalHandler;
 import unknow.server.jaxb.handler.BigIntegerHandler;
@@ -71,8 +73,6 @@
 import unknow.server.maven.jaxb.model.XmlCollection;
 import unknow.server.maven.jaxb.model.XmlLoader;
 import unknow.server.maven.jaxb.model.XmlType;
-import unknow.server.maven.model.AnnotationModel;
-import unknow.server.maven.model.TypeModel;
 
 /**
  * @author unknow

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/builder/HandlerEnum.java

@@ -21,14 +21,14 @@
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 
 import jakarta.xml.bind.JAXBException;
+import unknow.model.api.TypeModel;
 import unknow.server.jaxb.XmlRootHandler;
 import unknow.server.jaxb.XmlSimpleHandler;
 import unknow.server.maven.SourceBuilder.AbstractSourceBuilder;
 import unknow.server.maven.Utils;
 import unknow.server.maven.jaxb.HandlerContext;
 import unknow.server.maven.jaxb.JaxbGeneratorMojo;
 import unknow.server.maven.jaxb.model.XmlEnum;
-import unknow.server.maven.model.TypeModel;
 
 public class HandlerEnum extends AbstractSourceBuilder<HandlerContext> {
 

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/builder/HandlerObject.java

@@ -15,6 +15,7 @@
 import com.github.javaparser.ast.stmt.BlockStmt;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 
+import unknow.model.api.TypeModel;
 import unknow.server.jaxb.XmlHandler;
 import unknow.server.jaxb.XmlRootHandler;
 import unknow.server.maven.SourceBuilder.AbstractSourceBuilder;
@@ -27,7 +28,6 @@
 import unknow.server.maven.jaxb.model.XmlElement;
 import unknow.server.maven.jaxb.model.XmlType;
 import unknow.server.maven.jaxb.model.XmlTypeComplex;
-import unknow.server.maven.model.TypeModel;
 
 public class HandlerObject extends AbstractSourceBuilder<HandlerContext> {
 	private static final List<AbstractSourceBuilder<HandlerContext>> methods = Arrays.asList(new HandlerObjectWriter(), new HandlerObjectReader());

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/builder/HandlerObjectReader.java

@@ -39,6 +39,7 @@
 import jakarta.xml.bind.JAXBElement;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Unmarshaller;
+import unknow.model.api.TypeModel;
 import unknow.server.jaxb.StrReader;
 import unknow.server.jaxb.UnmarshallerImpl;
 import unknow.server.jaxb.XmlHandler;
@@ -52,7 +53,6 @@
 import unknow.server.maven.jaxb.model.XmlElements;
 import unknow.server.maven.jaxb.model.XmlType;
 import unknow.server.maven.jaxb.model.XmlTypeComplex;
-import unknow.server.maven.model.TypeModel;
 
 public class HandlerObjectReader extends AbstractSourceBuilder<HandlerContext> {
 	private static final String INSTANCE = "INSTANCE";

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/builder/HandlerObjectWriter.java

@@ -39,6 +39,7 @@
 import jakarta.xml.bind.JAXBElement;
 import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
+import unknow.model.api.TypeModel;
 import unknow.server.jaxb.MarshallerImpl;
 import unknow.server.maven.SourceBuilder.AbstractSourceBuilder;
 import unknow.server.maven.TypeCache;
@@ -49,7 +50,6 @@
 import unknow.server.maven.jaxb.model.XmlElement;
 import unknow.server.maven.jaxb.model.XmlType;
 import unknow.server.maven.jaxb.model.XmlTypeComplex;
-import unknow.server.maven.model.TypeModel;
 
 public class HandlerObjectWriter extends AbstractSourceBuilder<HandlerContext> {
 	private static final String INSTANCE = "INSTANCE";

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/model/XmlChoice.java

@@ -7,7 +7,7 @@
 
 import javax.xml.namespace.QName;
 
-import unknow.server.maven.model.TypeModel;
+import unknow.model.api.TypeModel;
 
 public class XmlChoice implements XmlType {
 	private final Collection<XmlElement> choice;

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/model/XmlCollection.java

@@ -8,7 +8,7 @@
 
 import javax.xml.namespace.QName;
 
-import unknow.server.maven.model.TypeModel;
+import unknow.model.api.TypeModel;
 
 /**
  * @author unknow

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/model/XmlElement.java

@@ -9,8 +9,8 @@
 
 import javax.xml.namespace.QName;
 
-import unknow.server.maven.model.BeanProperty;
-import unknow.server.maven.model.TypeModel;
+import unknow.model.api.BeanProperty;
+import unknow.model.api.TypeModel;
 
 /**
  * @author unknow

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/model/XmlEnum.java

@@ -9,8 +9,8 @@
 import javax.xml.namespace.QName;
 
 import jakarta.xml.bind.annotation.XmlEnumValue;
-import unknow.server.maven.model.EnumModel;
-import unknow.server.maven.model.EnumModel.EnumConstant;
+import unknow.model.api.EnumModel;
+import unknow.model.api.EnumModel.EnumConstant;
 
 /**
  * @author unknow

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/model/XmlLoader.java

@@ -37,14 +37,14 @@
 import jakarta.xml.bind.annotation.XmlSchema;
 import jakarta.xml.bind.annotation.XmlTransient;
 import jakarta.xml.bind.annotation.XmlValue;
+import unknow.model.api.AnnotationModel;
+import unknow.model.api.BeanProperty;
+import unknow.model.api.ClassModel;
+import unknow.model.api.PrimitiveModel;
+import unknow.model.api.TypeModel;
+import unknow.model.jvm.JvmModelLoader;
 import unknow.server.maven.jaxb.model.XmlElements.XmlGroup;
 import unknow.server.maven.jaxb.model.XmlTypeComplex.Factory;
-import unknow.server.maven.model.AnnotationModel;
-import unknow.server.maven.model.BeanProperty;
-import unknow.server.maven.model.ClassModel;
-import unknow.server.maven.model.PrimitiveModel;
-import unknow.server.maven.model.TypeModel;
-import unknow.server.maven.model.jvm.JvmModelLoader;
 
 /**
  * @author unknow

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/model/XmlType.java

@@ -7,7 +7,7 @@
 
 import javax.xml.namespace.QName;
 
-import unknow.server.maven.model.TypeModel;
+import unknow.model.api.TypeModel;
 
 /**
  * @author unknow

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/model/XmlTypeComplex.java

@@ -9,8 +9,8 @@
 
 import javax.xml.namespace.QName;
 
-import unknow.server.maven.model.ClassModel;
-import unknow.server.maven.model.TypeModel;
+import unknow.model.api.ClassModel;
+import unknow.model.api.TypeModel;
 
 /**
  * @author unknow

unknow-server-maven/src/main/java/unknow/server/maven/jaxb/model/XmlTypeSimple.java

@@ -7,7 +7,7 @@
 
 import javax.xml.namespace.QName;
 
-import unknow.server.maven.model.TypeModel;
+import unknow.model.api.TypeModel;
 
 /**
  * @author unknow

unknow-server-maven/src/main/java/unknow/server/maven/jaxrs/BeanParamBuilder.java

@@ -31,6 +31,8 @@
 
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.ext.ParamConverter;
+import unknow.model.api.TypeModel;
+import unknow.model.jvm.JvmModelLoader;
 import unknow.server.http.jaxrs.JaxrsContext;
 import unknow.server.http.jaxrs.JaxrsEntityReader;
 import unknow.server.http.jaxrs.JaxrsReq;
@@ -41,8 +43,6 @@
 import unknow.server.maven.jaxrs.JaxrsParam.JaxrsBeanParam.JaxrsBeanFieldParam;
 import unknow.server.maven.jaxrs.JaxrsParam.JaxrsBodyParam;
 import unknow.server.maven.jaxrs.JaxrsParam.JaxrsFormParam;
-import unknow.server.maven.model.TypeModel;
-import unknow.server.maven.model.jvm.JvmModelLoader;
 
 /**
  * @author unknow

unknow-server-maven/src/main/java/unknow/server/maven/jaxrs/JaxRsServletBuilder.java

@@ -61,6 +61,11 @@
 import jakarta.ws.rs.NotSupportedException;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.ext.ParamConverter;
+import unknow.model.api.ClassModel;
+import unknow.model.api.MethodModel;
+import unknow.model.api.ParamModel;
+import unknow.model.api.TypeModel;
+import unknow.model.jvm.JvmModelLoader;
 import unknow.server.http.jaxrs.JaxrsContext;
 import unknow.server.http.jaxrs.JaxrsEntityReader;
 import unknow.server.http.jaxrs.JaxrsEntityWriter;
@@ -72,11 +77,6 @@
 import unknow.server.maven.Utils;
 import unknow.server.maven.jaxrs.JaxrsParam.JaxrsBeanParam;
 import unknow.server.maven.jaxrs.JaxrsParam.JaxrsBodyParam;
-import unknow.server.maven.model.ClassModel;
-import unknow.server.maven.model.MethodModel;
-import unknow.server.maven.model.ParamModel;
-import unknow.server.maven.model.TypeModel;
-import unknow.server.maven.model.jvm.JvmModelLoader;
 
 /**
  * @author unknow
@@ -202,7 +202,7 @@ private void buildInializer() {
 			TypeModel type = m.m.type();
 			if (!type.isVoid()) {
 				if (type.isPrimitive())
-					type = type.asPrimitive().boxed();
+					type = JvmModelLoader.GLOBAL.get(type.asPrimitive().boxed());
 				ClassOrInterfaceType c = types.getClass(type.genericName());
 				cl.addField(types.getClass(JaxrsEntityWriter.class, c), m.v + "$r", Utils.PSF);
 				b.addStatement(new AssignExpr(new NameExpr(m.v + "$r"), new MethodCallExpr(new TypeExpr(types.getClass(JaxrsEntityWriter.class)), "create",

unknow-server-maven/src/main/java/unknow/server/maven/jaxrs/JaxrsMapping.java

@@ -5,8 +5,8 @@
 
 import java.util.List;
 
-import unknow.server.maven.model.ClassModel;
-import unknow.server.maven.model.MethodModel;
+import unknow.model.api.ClassModel;
+import unknow.model.api.MethodModel;
 
 public class JaxrsMapping {
 	public final String v;

unknow-server-maven/src/main/java/unknow/server/maven/jaxrs/JaxrsModel.java

@@ -62,6 +62,18 @@
 import jakarta.ws.rs.ext.MessageBodyWriter;
 import jakarta.ws.rs.ext.ParamConverterProvider;
 import jakarta.ws.rs.ext.Provider;
+import unknow.model.api.AncestrorIterator;
+import unknow.model.api.AnnotationModel;
+import unknow.model.api.BeanProperty;
+import unknow.model.api.ClassModel;
+import unknow.model.api.MethodModel;
+import unknow.model.api.ModelLoader;
+import unknow.model.api.ParamModel;
+import unknow.model.api.TypeModel;
+import unknow.model.api.WithAnnotation;
+import unknow.model.api.WithName;
+import unknow.model.api.WithType;
+import unknow.model.jvm.JvmModelLoader;
 import unknow.server.http.jaxrs.protostuff.ProtostuffJsonListAbstract.ProtostuffJsonLineProvider;
 import unknow.server.http.jaxrs.protostuff.ProtostuffJsonListAbstract.ProtostuffJsonListProvider;
 import unknow.server.http.jaxrs.protostuff.ProtostuffJsonProvider;
@@ -78,17 +90,6 @@
 import unknow.server.maven.jaxrs.JaxrsParam.JaxrsMatrixParam;
 import unknow.server.maven.jaxrs.JaxrsParam.JaxrsPathParam;
 import unknow.server.maven.jaxrs.JaxrsParam.JaxrsQueryParam;
-import unknow.server.maven.model.AnnotationModel;
-import unknow.server.maven.model.BeanProperty;
-import unknow.server.maven.model.ClassModel;
-import unknow.server.maven.model.MethodModel;
-import unknow.server.maven.model.ModelLoader;
-import unknow.server.maven.model.ParamModel;
-import unknow.server.maven.model.TypeModel;
-import unknow.server.maven.model.util.AncestrorIterator;
-import unknow.server.maven.model.util.WithAnnotation;
-import unknow.server.maven.model.util.WithName;
-import unknow.server.maven.model.util.WithType;
 
 /**
  * @author unknow
@@ -355,7 +356,7 @@ public static TypeModel getParamType(TypeModel type) {
 		if (type.isArray())
 			type = type.asArray().type();
 		if (type.isPrimitive())
-			return type.asPrimitive().boxed();
+			return JvmModelLoader.GLOBAL.get(type.asPrimitive().boxed());
 
 		if (!type.isClass())
 			return type;

unknow-server-maven/src/main/java/unknow/server/maven/jaxrs/JaxrsMojo.java

@@ -59,14 +59,14 @@
 import jakarta.ws.rs.ext.ParamConverter;
 import jakarta.ws.rs.ext.ParamConverterProvider;
 import jakarta.ws.rs.ext.RuntimeDelegate;
+import unknow.model.api.ClassModel;
+import unknow.model.api.TypeModel;
 import unknow.server.http.jaxrs.JaxrsContext;
 import unknow.server.http.jaxrs.JaxrsRuntime;
 import unknow.server.http.jaxrs.protostuff.ProtostuffSchema;
 import unknow.server.maven.AbstractGeneratorMojo;
 import unknow.server.maven.TypeCache;
 import unknow.server.maven.Utils;
-import unknow.server.maven.model.ClassModel;
-import unknow.server.maven.model.TypeModel;
 
 /**
  * @author unknow

unknow-server-maven/src/main/java/unknow/server/maven/jaxrs/JaxrsParam.java

@@ -8,15 +8,15 @@
 
 import jakarta.ws.rs.DefaultValue;
 import jakarta.ws.rs.Encoded;
-import unknow.server.maven.model.BeanProperty;
-import unknow.server.maven.model.ClassModel;
-import unknow.server.maven.model.MethodModel;
-import unknow.server.maven.model.ParamModel;
-import unknow.server.maven.model.PrimitiveModel;
-import unknow.server.maven.model.TypeModel;
-import unknow.server.maven.model.util.WithAnnotation;
-import unknow.server.maven.model.util.WithName;
-import unknow.server.maven.model.util.WithType;
+import unknow.model.api.BeanProperty;
+import unknow.model.api.ClassModel;
+import unknow.model.api.MethodModel;
+import unknow.model.api.ParamModel;
+import unknow.model.api.PrimitiveModel;
+import unknow.model.api.TypeModel;
+import unknow.model.api.WithAnnotation;
+import unknow.model.api.WithName;
+import unknow.model.api.WithType;
 
 /**
  * @author unknow