Merge pull request #338 from bsinno/feature/#331_return_error_log_whe…

…n_generation_fails Return error log when code generation fails; fixes #331;
eclipse-vorto · Jul 18, 2016 · 7e08240 · 7e08240
2 parents 90074c8 + 61ae0ea
commit 7e08240
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/....vorto.codegen.ui/src/org/eclipse/vorto/codegen/ui/handler/CodeGeneratorTaskExecutor.java b/....vorto.codegen.ui/src/org/eclipse/vorto/codegen/ui/handler/CodeGeneratorTaskExecutor.java
@@ -18,6 +18,8 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.vorto.codegen.api.Generated;
+import org.eclipse.vorto.codegen.api.GenerationResultZip;
 import org.eclipse.vorto.codegen.api.IGenerationResult;
 import org.eclipse.vorto.codegen.api.IVortoCodeGenerator;
 import org.eclipse.vorto.codegen.api.mapping.InvocationContext;
@@ -48,17 +50,17 @@ protected IStatus run(IProgressMonitor monitor) {
 				monitor.beginTask(
 						"Invoking generator [" + codeGenerator.getServiceKey() + "]",
 						1);
+				IGenerationResult generatedResult = null;
 				try {
-					IGenerationResult generatedResult = ((IVortoCodeGenerator) codeGenerator).generate(informationModel,invocationContext);
-					CodeGenerationHelper.createEclipseProject(ModelIdFactory.newInstance(informationModel), codeGenerator.getServiceKey(), generatedResult);
-					monitor.worked(1);
-					if (monitor.isCanceled()) {
-						monitor.done();
-						return Status.CANCEL_STATUS;
-					}
-
+					generatedResult = ((IVortoCodeGenerator) codeGenerator).generate(informationModel,invocationContext);
 				} catch (Exception e) {
-					e.printStackTrace();
+					MessageDisplayFactory.getMessageDisplay().displayError(e);
+					return Status.CANCEL_STATUS;
+				}
+				CodeGenerationHelper.createEclipseProject(ModelIdFactory.newInstance(informationModel), codeGenerator.getServiceKey(), generatedResult);
+				monitor.worked(1);
+				if (monitor.isCanceled()) {
+					monitor.done();
 					return Status.CANCEL_STATUS;
 				}
 				monitor.done();

diff --git a/bundles/org.eclipse.vorto.codegen/src/org/eclipse/vorto/codegen/api/IVortoCodeGenerator.java b/bundles/org.eclipse.vorto.codegen/src/org/eclipse/vorto/codegen/api/IVortoCodeGenerator.java
@@ -32,7 +32,7 @@ public interface IVortoCodeGenerator {
 	 * @param context generation invocation context, e.g. mapping rules or invocation parameters
 	 * @return
 	 */
-	IGenerationResult generate(InformationModel model, InvocationContext context);
+	IGenerationResult generate(InformationModel model, InvocationContext context) throws Exception;
 
 	/**
 	 * 

diff --git a/...rvice/src/main/java/org/eclipse/vorto/service/generator/web/CodeGenerationController.java b/...rvice/src/main/java/org/eclipse/vorto/service/generator/web/CodeGenerationController.java
@@ -10,6 +10,8 @@
 import javax.annotation.PostConstruct;
 
 import org.apache.commons.io.IOUtils;
+import org.eclipse.vorto.codegen.api.Generated;
+import org.eclipse.vorto.codegen.api.GenerationResultZip;
 import org.eclipse.vorto.codegen.api.GeneratorServiceInfo;
 import org.eclipse.vorto.codegen.api.IGenerationResult;
 import org.eclipse.vorto.codegen.api.IVortoCodeGenerator;
@@ -92,15 +94,23 @@ public ResponseEntity<InputStreamResource> generate(@PathVariable String namespa
 
 		InformationModel infomodel = extractor.extract(new ModelId(ModelType.InformationModel, name, namespace, version));
 
-		IGenerationResult result = vortoGenerator.generate(infomodel, resolveMappingContext(infomodel, vortoGenerator.getServiceKey()));
-
+		IGenerationResult result = null;
+		try {
+			result = vortoGenerator.generate(infomodel, resolveMappingContext(infomodel, vortoGenerator.getServiceKey()));
+		} catch (Exception e) {
+			GenerationResultZip output = new GenerationResultZip(infomodel,vortoGenerator.getServiceKey());
+			Generated generated = new Generated("generation_error.log", "/generated", e.getMessage());
+			output.write(generated);
+			result = output;
+		}
+
 		return ResponseEntity.ok().contentLength(result.getContent().length)
 				.header("content-disposition", "attachment; filename = " + result.getFileName())
 				.contentType(MediaType.parseMediaType(result.getMediatype()))
 				.body(new InputStreamResource(new ByteArrayInputStream(result.getContent())));
+
 	}
 
-
 	private InvocationContext resolveMappingContext(InformationModel model, String targetPlatform) {
 		byte[] mappingResources = downloadMappingModel(model, targetPlatform);
 		return new MappingZipFileExtractor(mappingResources).extract();