Fixes #449 - #449 (#451)

* Fixes #449 - #449 Signed-off-by: Erle Czar Mantos <[email protected]> * Remove print logs. Signed-off-by: Erle Czar Mantos <[email protected]>
eclipse-vorto · Nov 28, 2016 · 505e984 · 505e984
1 parent c4e423d
commit 505e984
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/...es/org.eclipse.vorto.repository/src/org/eclipse/vorto/repository/RestModelRepository.java b/...es/org.eclipse.vorto.repository/src/org/eclipse/vorto/repository/RestModelRepository.java
@@ -193,7 +193,7 @@ public List<GeneratorResource> listGenerators() {
 	public Attachment generateCode(ModelId model, String serviceKey) {
 		try {
 			String url = "generation-router/" + model.getNamespace() + "/" + model.getName() + "/" + model.getVersion()
-					+ "/" + serviceKey;
+					+ "/" + URLEncoder.encode(serviceKey, "utf-8");
 			Attachment result = httpClient.executeGetAttachment(url);
 			return result;
 		} catch (RepositoryException e) {

diff --git a/server/generators/org.eclipse.vorto.codegen.service.prosystfi/pom.xml b/server/generators/org.eclipse.vorto.codegen.service.prosystfi/pom.xml
@@ -17,6 +17,10 @@
 			<groupId>org.eclipse.vorto</groupId>
 			<artifactId>org.eclipse.vorto.codegen</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.eclipse.vorto</groupId>
+			<artifactId>org.eclipse.vorto.codegen.templates.java</artifactId>
+		</dependency>				
 		<dependency>
 			<groupId>org.eclipse.vorto</groupId>
 			<artifactId>org.eclipse.vorto.codegen.examples.prosystfi</artifactId>

diff --git a/server/pom.xml b/server/pom.xml
@@ -67,6 +67,11 @@
 				<artifactId>org.eclipse.vorto.codegen</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.eclipse.vorto</groupId>
+				<artifactId>org.eclipse.vorto.codegen.templates.java</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.eclipse.vorto</groupId>
 				<artifactId>org.eclipse.vorto.editor</artifactId>

diff --git a/...epo/repo-ui/src/main/java/org/eclipse/vorto/repository/web/ModelGenerationController.java b/...epo/repo-ui/src/main/java/org/eclipse/vorto/repository/web/ModelGenerationController.java
@@ -16,6 +16,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -80,12 +81,13 @@ public void generate( 	@ApiParam(value = "The namespace of vorto model, e.g. com
 
 		Map<String, String> requestParams = new HashMap<>();
 		request.getParameterMap().entrySet().stream().forEach(x -> requestParams.put(x.getKey(), x.getValue()[0]));
-
-		GeneratedOutput generatedOutput = generatorService.generate(new ModelId(name,namespace,version), serviceKey, requestParams);
-		response.setHeader(CONTENT_DISPOSITION, ATTACHMENT_FILENAME + generatedOutput.getFileName());
-		response.setContentLengthLong(generatedOutput.getSize());
-		response.setContentType(APPLICATION_OCTET_STREAM);
+
 		try {
+			GeneratedOutput generatedOutput = generatorService.generate(new ModelId(name,namespace,version), URLDecoder.decode(serviceKey, "utf-8"), requestParams);
+			response.setHeader(CONTENT_DISPOSITION, ATTACHMENT_FILENAME + generatedOutput.getFileName());
+			response.setContentLengthLong(generatedOutput.getSize());
+			response.setContentType(APPLICATION_OCTET_STREAM);
+
 			IOUtils.copy(new ByteArrayInputStream(generatedOutput.getContent()), response.getOutputStream());
 			response.flushBuffer();
 		} catch (IOException e) {