Commit 6a59a8b0 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* extracted method, made cleanName static

parent e8b3ad75

plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/transform/AbstractTranslator.java

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public abstract class AbstractTranslator { 
		return getTypeFor(cleanName(name), tdlPackage.Literals.STRUCTURED_DATA_TYPE);

	}



	public String cleanName(String name) {

	public static String cleanName(String name) {

		//TODO: use keywords filter?

//		List<String> keywords = List.of("Message", "Time", "Type", "type", "name", "instance", "size", "component");

		List<String> keywords = List.of("Message", "Time", "Type", "instance", "size", "component");

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

+5 −1
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ public class ConverterNext { 
		return processToString(inputPath, outputPath, sourceMapping, targetMapping, false);

	}

	

	public static String getTargetPackageName(String inputPath) {

		return AbstractTranslator.cleanName(new File(inputPath).getName());

	}

	

	public static String processToString(String inputPath, String outputPath, String sourceMapping, String targetMapping, boolean inline) {

//		OpenAPI spec = parseSpec(inputPath);

		System.out.println("Exporting: "+outputPath+ " : "+ new File(outputPath).getAbsolutePath());
@@ -36,7 +40,7 @@ public class ConverterNext { 
		try {

			Resource tr = TDLHelper.create(outputPath);

			translator.setTargetResource(tr);

			translator.initTargetResource(translator.cleanName(new File(inputPath).getName()));

			translator.initTargetResource(getTargetPackageName(inputPath));

			translator.translate(inputPath, sourceMapping, targetMapping, inline);

			content = TDLHelper.getText(tr);

		} catch (Exception e) {