Commit 4355a47a authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* factored out parts that are now inherited

parent db0da0c4

plugins/org.etsi.mts.tdl.openapi2tdl.next/src/org/etsi/mts/tdl/openapi2tdl/next/OpenAPI2TDLTranslatorNext.java

+3 −20
Original line number Diff line number Diff line
@@ -6,10 +6,7 @@ import org.etsi.mts.tdl.CollectionDataType; 
import org.etsi.mts.tdl.DataElementMapping;

import org.etsi.mts.tdl.DataType;

import org.etsi.mts.tdl.Member;

import org.etsi.mts.tdl.Parameter;

import org.etsi.mts.tdl.ParameterMapping;

import org.etsi.mts.tdl.StructuredDataType;

import org.etsi.mts.tdl.tdlFactory;

import org.etsi.mts.tdl.tdlPackage;

import org.etsi.mts.tdl.transform.AbstractTranslator;

import org.openapitools.codegen.utils.ModelUtils;
@@ -27,8 +24,6 @@ public class OpenAPI2TDLTranslatorNext extends AbstractTranslator { 
	private OpenAPI model;

	

	public void translate(String filename) throws Exception {

		String sourceMappingTag = "SOURCE_MAPPING";

		String targetMappingTag = "TARGET_MAPPING";

		translate(filename, sourceMappingTag, targetMappingTag);

	}
@@ -56,15 +51,10 @@ public class OpenAPI2TDLTranslatorNext extends AbstractTranslator { 
	}



	private void addMapping(Schema<?> schema, DataType dataType, String sourceMappingTag, String targetMappingTag) {

		DataElementMapping sourceMapping = getTypeFor(schema.getName()+"_"+sourceMappingTag, tdlPackage.Literals.DATA_ELEMENT_MAPPING);

		sourceMapping.setMappableDataElement(dataType);

		sourceMapping.setElementURI("#/components/schemas/"+schema.getName()+"");

		sourceMapping.setDataResourceMapping(drm);

		DataElementMapping sourceMapping = addDataElementMapping("#/components/schemas/"+schema.getName()+"", dataType, sourceMappingTag);



		//TODO: make configurable?

		DataElementMapping targetMapping = getTypeFor(schema.getName()+"_"+targetMappingTag, tdlPackage.Literals.DATA_ELEMENT_MAPPING);

		targetMapping.setMappableDataElement(dataType);

		targetMapping.setElementURI(""+schema.getName()+"");

		DataElementMapping targetMapping = addDataElementMapping(""+schema.getName()+"", dataType, targetMappingTag);

		targetMapping.setDataResourceMapping(drmTarget);



		if (dataType instanceof StructuredDataType) {
@@ -75,13 +65,6 @@ public class OpenAPI2TDLTranslatorNext extends AbstractTranslator { 
		}

	}



	private void addParameterMapping(DataElementMapping mapping, Parameter p, String uri) {

		ParameterMapping pm = (ParameterMapping) tdlFactory.eINSTANCE.create(tdlPackage.Literals.PARAMETER_MAPPING);

		pm.setParameter(p);

		pm.setParameterURI(uri.replaceAll("\\^", ""));

		mapping.getParameterMapping().add(pm);

	}



	private DataType translate(Schema<?> schema, String prefix) {

		if (schema.getType()==null && (schema.getProperties() == null || schema.getProperties().isEmpty())) {

			if (schema.getName() == null) {