Working on JAXB mapping

bguijt · Jul 13, 2015 · c7cd4bf · c7cd4bf
1 parent dae8889
commit c7cd4bf
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/...om.mulesoft.jaxrs.raml.generator/src/com/mulesoft/jaxrs/raml/jaxb/SchemaModelBuilder.java b/...om.mulesoft.jaxrs.raml.generator/src/com/mulesoft/jaxrs/raml/jaxb/SchemaModelBuilder.java
@@ -51,7 +51,11 @@ private ISchemaType generateType(JAXBType jaxbType, StructureType structureType)
 			return existing;
 		}
 		HashMap<String,String> namespaces = jaxbType.gatherNamespaces();
-		TypeModelImpl typeModel = new TypeModelImpl(xmlName,jaxbType.getClassName(),namespaces,structureType);
+		ISchemaType schemaType = getType(jaxbType,structureType,namespaces);
+		if(!(schemaType instanceof TypeModelImpl)){
+			return schemaType;
+		}
+		TypeModelImpl typeModel = (TypeModelImpl) schemaType;
 		this.jaxbTypeMap.put(xmlName, typeModel);
 		HashMap<String,String>prefixes=jaxbType.gatherNamespaces();
 
@@ -113,6 +117,11 @@ else if (p instanceof JAXBElementProperty){
 	private ISchemaType getType(JAXBProperty p) {
 
 		JAXBType propertyType = p.getType();
+		StructureType st = p.getStructureType();
+		return getType(propertyType, st, null);
+	}
+
+	private ISchemaType getType(JAXBType propertyType, StructureType st, HashMap<String, String> namespaces) {
 		String canonicalName = propertyType!=null ? propertyType.getClassName() : "java.lang.Object";
 
 		ISchemaType primitive = getPrimitiveType(canonicalName);
@@ -122,7 +131,8 @@ private ISchemaType getType(JAXBProperty p) {
 
 		TypeModelImpl type = this.javaTypeMap.get(canonicalName);
 		if(type==null){
-			type = new TypeModelImpl(canonicalName,canonicalName,null,false,p.getStructureType());
+			String xmlName = propertyType.getXMLName();			
+			type = new TypeModelImpl(xmlName,canonicalName,namespaces,st);
 			this.javaTypeMap.put(canonicalName, type);
 		}
 		return type;

diff --git a/jaxrs-to-raml/com.mulesoft.jaxrs.raml.generator/src/org/raml/schema/model/ISchemaType.java b/jaxrs-to-raml/com.mulesoft.jaxrs.raml.generator/src/org/raml/schema/model/ISchemaType.java
@@ -24,4 +24,8 @@ public interface ISchemaType {
 	String getClassQualifiedName();
 
 	StructureType getParentStructureType();
+
+	boolean isMapping();
+
+	ISchemaType getActualType();
 }
diff --git a/jaxrs-to-raml/com.mulesoft.jaxrs.raml.generator/src/org/raml/schema/model/SimpleType.java b/jaxrs-to-raml/com.mulesoft.jaxrs.raml.generator/src/org/raml/schema/model/SimpleType.java
@@ -67,4 +67,14 @@ public String getClassQualifiedName() {
 	public StructureType getParentStructureType() {
 		return StructureType.COMMON;
 	}
+
+	@Override
+	public boolean isMapping() {
+		return false;
+	}
+
+	@Override
+	public ISchemaType getActualType() {
+		return this;
+	}
 }
diff --git a/...-raml/com.mulesoft.jaxrs.raml.generator/src/org/raml/schema/model/impl/TypeModelImpl.java b/...-raml/com.mulesoft.jaxrs.raml.generator/src/org/raml/schema/model/impl/TypeModelImpl.java
@@ -19,7 +19,7 @@ public TypeModelImpl(String name, String classQualifiedName, Map<String,String>
 		this.parentStructureType = parentStructureType;
 	}
 
-	public TypeModelImpl(String name, String classQualifiedName, Map<String,String> namespaces, boolean isSimple,StructureType parentStructureType) {
+	protected TypeModelImpl(String name, String classQualifiedName, Map<String,String> namespaces, boolean isSimple,StructureType parentStructureType) {
 		super();
 		this.name = name;
 		this.isSimple = isSimple;
@@ -102,4 +102,16 @@ public StructureType getParentStructureType() {
 		return this.parentStructureType;
 	}
 
+	@Override
+	public boolean isMapping() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public ISchemaType getActualType() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }