Fixes eclipse-vorto#625

Signed-off-by: shiv12095 <[email protected]>

server/devtool/org.eclipse.vorto.editor.web/src/main/java/org/eclipse/vorto/editor/web/resource/FileResourceHandler.xtend

@@ -30,6 +30,7 @@ import org.eclipse.xtext.web.server.model.IWebDocumentProvider
 import org.eclipse.xtext.web.server.model.IWebResourceSetProvider
 import org.eclipse.xtext.web.server.model.IXtextWebDocument
 import org.eclipse.xtext.web.server.persistence.IServerResourceHandler
+import org.eclipse.emf.common.notify.impl.NotificationChainImpl
 
 class FileResourceHandler implements IServerResourceHandler {
 
@@ -69,6 +70,10 @@ class FileResourceHandler implements IServerResourceHandler {
 	override put(IXtextWebDocument document, IServiceContext serviceContext) throws IOException {
 		try {
 			val uri = getFileURI(document.resourceId)
+			val resourceSet = resourceSetProvider.get(document.resourceId, serviceContext)
+			if(document.resource.resourceSet === null){
+				document.resource.basicSetResourceSet(resourceSet, new NotificationChainImpl);
+			}
 			val outputStream = document.resource.resourceSet.URIConverter.createOutputStream(uri)
 			val writer = new OutputStreamWriter(outputStream, encodingProvider.getEncoding(uri))
 			writer.write(document.text)

server/devtool/projectrepository-api/src/main/java/org/eclipse/vorto/devtool/projectrepository/IProjectRepositoryService.java

@@ -17,6 +17,7 @@
 import java.util.Map;
 
 import org.eclipse.vorto.devtool.projectrepository.model.FileResource;
+import org.eclipse.vorto.devtool.projectrepository.model.FolderResource;
 import org.eclipse.vorto.devtool.projectrepository.model.ProjectResource;
 import org.eclipse.vorto.devtool.projectrepository.model.Resource;
 import org.eclipse.vorto.devtool.projectrepository.model.ResourceContent;
@@ -98,6 +99,16 @@ public ProjectResource createProject(String projectName, String commitMessage)
 	 */
 	public void uploadResource(String commitComment, UploadHandle... handle);
 
+	/**
+	 * Updates the old properties of the resource with the new properties
+	 * 
+	 * @param folderResource
+	 * 				The folderResource whose properties would be updated
+	 * @param properties
+	 * 				The properties of the resource that would be added / modified
+	 */
+	public void updateFolderResourceProperties(FolderResource folderResource,  Map<String,String> properties);
+
 	/**
 	 * Create a version of a project.
 	 * 

server/devtool/projectrepository-file/src/main/java/org/eclipse/vorto/devtool/projectrepository/file/ProjectRepositoryFileConstants.java

@@ -1,23 +1,40 @@
 package org.eclipse.vorto.devtool.projectrepository.file;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.eclipse.vorto.devtool.projectrepository.model.Resource;
 
 public class ProjectRepositoryFileConstants {
 
 	public static final String META_PROPERTY_AUTHOR = Resource.META_PROPERTY_AUTHOR;
 
 	public static final String META_PROPERTY_RESOURCE_ID = "resourceId";
-	
+
 	public static final String META_PROPERTY_NAME = "name";
-	
+
 	public static final String META_PROPERTY_NAMESPACE = "namespace";
-	
+
 	public static final String META_PROPERTY_VERSION = "version";
-	
+
 	public static final String META_PROPERTY_MODEL_TYPE = "modelType";
-	
+
 	public static final String META_PROPERTY_MODEL_SUB_TYPE = "modelSubType";
-	
+
 	public static final String META_PROPERTY_IS_PROJECT = "isProject";
-
+
+	public static final String META_PROPERTY_REFERENCES = "references";
+
+	public static Set<String> IMMUTABLE_META_PROPERTY_SET = new HashSet<String>(Arrays.asList(
+		META_PROPERTY_AUTHOR,
+		META_PROPERTY_IS_PROJECT,
+		META_PROPERTY_RESOURCE_ID,
+		META_PROPERTY_NAME,
+		META_PROPERTY_NAMESPACE,
+		META_PROPERTY_VERSION,
+		META_PROPERTY_MODEL_SUB_TYPE,
+		META_PROPERTY_MODEL_TYPE
+	));
+
 }

server/devtool/projectrepository-file/src/main/java/org/eclipse/vorto/devtool/projectrepository/file/ProjectRepositoryServiceFS.java

@@ -16,6 +16,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
@@ -32,6 +33,7 @@
 import org.eclipse.vorto.devtool.projectrepository.WrongUploadHandleTypeError;
 import org.eclipse.vorto.devtool.projectrepository.model.FileResource;
 import org.eclipse.vorto.devtool.projectrepository.model.FileUploadHandle;
+import org.eclipse.vorto.devtool.projectrepository.model.FolderResource;
 import org.eclipse.vorto.devtool.projectrepository.model.FolderUploadHandle;
 import org.eclipse.vorto.devtool.projectrepository.model.ProjectResource;
 import org.eclipse.vorto.devtool.projectrepository.model.ProjectUploadHandle;
@@ -76,7 +78,7 @@ public ProjectResource createProject(String name, String commitMessage) throws R
 		log.info("Create a new project. Name : " + name);
 		File projectFolder = new File(projectsDirectory + File.separator + name);
 		createProjectDirectory(projectFolder);
-		
+
 		Map<String, String> properties = addProjectResourceProperties(new HashMap<String, String>());
 		createMetaFile(addSystemProperties(properties), projectFolder);
 		log.info("Directory for Project " + name + " created.");
@@ -94,10 +96,10 @@ private Map<String, String> addSystemProperties(Map<String, String> source) {
 	@Override
 	public ProjectResource createProject(String name, Map<String, String> properties, String commitMessage)
 			throws ResourceAlreadyExistsError {
-		log.info("Create a new project. Name : " + name);		
+		log.info("Create a new project. Name : " + name);
 		File projectFolder = new File(projectsDirectory + File.separator + name);
 		createProjectDirectory(projectFolder);
-		
+
 		properties = addProjectResourceProperties(properties);
 		createMetaFile(addSystemProperties(properties), projectFolder);
 		log.info("Directory for Project " + name + " created.");
@@ -160,6 +162,27 @@ public void uploadResource(String commitComment, UploadHandle... handles) {
 		}
 	}
 
+	@Override
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	public void updateFolderResourceProperties(FolderResource resource, Map<String, String> properties) {
+		String metaFileDirectoryPath = projectsDirectory + File.separator + resource.getPath();
+		File metaFileDirectory = new File(metaFileDirectoryPath);
+		File metaFile = new File(metaFileDirectoryPath, META_PROPERTY_FILENAME);
+		Properties metaProperties = new Properties();
+		try {
+			metaProperties.loadFromXML(new FileInputStream(metaFile));
+		} catch (Exception ex) {
+			// Nothing to do here.
+		}
+		HashMap<String, String> map = new HashMap(metaProperties);
+		for (Map.Entry<String, String> entry : properties.entrySet()) {
+			if(!ProjectRepositoryFileConstants.IMMUTABLE_META_PROPERTY_SET.contains(entry.getKey())){
+				map.put(entry.getKey(), entry.getValue());
+			}
+		}
+		createMetaFile(map, metaFileDirectory);
+	}
+
 	@Override
 	public void createVersionOfProject(String versionName, String projectName) {
 		throw new UnsupportedOperationException();
@@ -322,7 +345,7 @@ private File createFile(FileUploadHandle content) {
 	public String theProjectsDirectory() {
 		return this.projectsDirectory;
 	}
-	
+
 	private Map<String, String> addProjectResourceProperties(Map<String, String> source) {
 		source.put(ProjectRepositoryFileConstants.META_PROPERTY_IS_PROJECT, String.valueOf(true));
 		return source;

server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/config/EditorConfigurationCloud.java

@@ -48,7 +48,7 @@ public IProjectRepositoryService projectRepositoryService() {
 
 	@Bean
 	public GlobalContext getGlobalContext(){
-		return new GlobalContext(repositoryBasePath, referenceRepository);
+		return new GlobalContext(repositoryBasePath);
 	}
 
 }

server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/config/EditorConfigurationLocal.java

@@ -79,7 +79,7 @@ public IProjectRepositoryService projectRepositoryService() {
 
 	@Bean
 	public GlobalContext getGlobalContext(){
-		return new GlobalContext(repositoryBasePath, referenceRepository);
+		return new GlobalContext(repositoryBasePath);
 	}
 
 	@Bean

server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/http/response/DeleteResourceRequest.java → server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/http/request/DeleteResourceRequest.java

@@ -12,7 +12,7 @@
  * Contributors:
  * Bosch Software Innovations GmbH - Please refer to git log
  *******************************************************************************/
-package org.eclipse.vorto.server.devtool.http.response;
+package org.eclipse.vorto.server.devtool.http.request;
 
 public class DeleteResourceRequest {
 

server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/http/response/LinkReferenceModelRequest.java → server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/http/request/LinkReferenceModelRequest.java

@@ -12,7 +12,7 @@
  * Contributors:
  * Bosch Software Innovations GmbH - Please refer to git log
  *******************************************************************************/
-package org.eclipse.vorto.server.devtool.http.response;
+package org.eclipse.vorto.server.devtool.http.request;
 
 public class LinkReferenceModelRequest {
 

server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/http/response/LinkReferenceResourceRequest.java → server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/http/request/LinkReferenceResourceRequest.java

@@ -12,7 +12,7 @@
  * Contributors:
  * Bosch Software Innovations GmbH - Please refer to git log
  *******************************************************************************/
-package org.eclipse.vorto.server.devtool.http.response;
+package org.eclipse.vorto.server.devtool.http.request;
 
 public class LinkReferenceResourceRequest {
 

server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/http/request/Response.java → server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/http/response/Response.java

@@ -12,7 +12,7 @@
  * Contributors:
  * Bosch Software Innovations GmbH - Please refer to git log
  *******************************************************************************/
-package org.eclipse.vorto.server.devtool.http.request;
+package org.eclipse.vorto.server.devtool.http.response;
 
 import org.eclipse.vorto.devtool.projectrepository.model.Resource;
 

server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/models/GlobalContext.java

@@ -17,11 +17,8 @@
 public class GlobalContext {
 
 	public String repositoryBasePath = null;
-
-	public String referenceRepository = null;
-
-	public GlobalContext(String repositoryBasePath, String referenceRepository) {
+
+	public GlobalContext(String repositoryBasePath) {
 		this.repositoryBasePath = repositoryBasePath;
-		this.referenceRepository = referenceRepository;
 	}
 }

server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/models/LinkReferenceResponse.java

@@ -0,0 +1,39 @@
+package org.eclipse.vorto.server.devtool.models;
+
+public class LinkReferenceResponse {
+
+	private String content;
+	private String targetResourceId;
+	private String referenceResourceId;
+
+	public LinkReferenceResponse(String content, String targetResourceId, String referenceResourceId) {
+		this.content = content;
+		this.targetResourceId = targetResourceId;
+		this.referenceResourceId = referenceResourceId;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public String getTargetResourceId() {
+		return targetResourceId;
+	}
+
+	public void setTargetResourceId(String targetResourceId) {
+		this.targetResourceId = targetResourceId;
+	}
+
+	public String getReferenceResourceId() {
+		return referenceResourceId;
+	}
+
+	public void setReferenceResourceId(String referenceResourceId) {
+		this.referenceResourceId = referenceResourceId;
+	}
+
+}

server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/service/IEditorService.java

@@ -21,6 +21,7 @@
 import org.eclipse.vorto.repository.api.ModelId;
 import org.eclipse.vorto.repository.api.ModelInfo;
 import org.eclipse.vorto.repository.api.ModelType;
+import org.eclipse.vorto.server.devtool.models.LinkReferenceResponse;
 import org.eclipse.vorto.server.devtool.models.ModelResource;
 import org.eclipse.vorto.server.devtool.utils.DevtoolReferenceLinker;
 import org.eclipse.vorto.server.devtool.utils.DevtoolRestClient;
@@ -33,26 +34,26 @@ public abstract class IEditorService {
 
 	@Autowired
 	private DevtoolRestClient devtoolRestClient;
-	
+
 	@Autowired
 	private DevtoolReferenceLinker devtoolReferenceLinker;
-	
+
 	@Autowired
 	private DevtoolUtils devtoolUtils;
-	
+
 	@Autowired
 	private IProjectService projectService;
 
 	public abstract List<ModelInfo> searchModelByExpression(String expression);
 
 	public abstract String generateFileContent(ModelResource modelResource);
-	
+
 	public abstract ModelInfo getAndValidateModelInfo(ModelId modelId);
-	
-	public abstract void updateVariableNames(String targetResourceId, String referenceResourceId, ResourceSet resourceSet);
-
-	public final List<ModelInfo> searchModelByExpressionAndValidate(String expression,
-			List<ModelType> modelTypeList) {
+
+	public abstract void updateVariableNames(String targetResourceId, String referenceResourceId,
+			ResourceSet resourceSet);
+
+	public final List<ModelInfo> searchModelByExpressionAndValidate(String expression, List<ModelType> modelTypeList) {
 		List<ModelInfo> resourceList = devtoolRestClient.searchByExpression(expression);
 		ArrayList<ModelInfo> modelResourceList = new ArrayList<ModelInfo>();
 		for (ModelInfo modelResource : resourceList) {
@@ -65,29 +66,35 @@ public final List<ModelInfo> searchModelByExpressionAndValidate(String expressio
 		return modelResourceList;
 	}
 
-	public final String linkReferenceToResource(String targetResourceId, ModelId modelId, ResourceSet resourceSet) {
+	public final LinkReferenceResponse linkReferenceToResource(String targetResourceId, ModelId modelId,
+			ResourceSet resourceSet) {
 		validateArguments(targetResourceId, resourceSet);
 		ModelInfo modelInfo = getAndValidateModelInfo(modelId);
 		projectService.getReferencedResource(modelInfo);
 		String referenceResourceId = devtoolUtils.getReferencedResourceId(modelInfo);
-		return linkReference(targetResourceId, referenceResourceId, resourceSet);
+		String content = linkReference(targetResourceId, referenceResourceId, resourceSet);
+		LinkReferenceResponse linkReferenceResponse = new LinkReferenceResponse(content, targetResourceId,
+				referenceResourceId);
+		return linkReferenceResponse;
 	}
 
-	public final String linkReferenceToResource(String targetResourceId, String referenceResourceId,
+	public final LinkReferenceResponse linkReferenceToResource(String targetResourceId, String referenceResourceId,
 			ResourceSet resourceSet) {
 		validateArguments(referenceResourceId, resourceSet);
 		validateArguments(targetResourceId, resourceSet);
-		return linkReference(targetResourceId, referenceResourceId, resourceSet);
+		String content = linkReference(targetResourceId, referenceResourceId, resourceSet);
+		LinkReferenceResponse linkReferenceResponse = new LinkReferenceResponse(content, targetResourceId,
+				referenceResourceId);
+		return linkReferenceResponse;
 	}
-	
-	private void validateArguments(String resourceId, ResourceSet resourceSet){
+
+	private void validateArguments(String resourceId, ResourceSet resourceSet) {
 		if (!devtoolReferenceLinker.containsResource(resourceId, resourceSet)) {
 			throw new RuntimeException("No resource with resourceId : " + resourceId);
 		}
 	}
-
-	private String linkReference(String targetResourceId, String referenceResourceId,
-			ResourceSet resourceSet){
+
+	private String linkReference(String targetResourceId, String referenceResourceId, ResourceSet resourceSet) {
 		devtoolReferenceLinker.linkReferenceToResource(targetResourceId, referenceResourceId, resourceSet);
 		updateVariableNames(targetResourceId, referenceResourceId, resourceSet);
 		return devtoolUtils.getResourceContentsAsString(targetResourceId, resourceSet);

server/devtool/webeditor/src/main/java/org/eclipse/vorto/server/devtool/service/IProjectService.java

@@ -24,6 +24,8 @@
 public interface IProjectService {
 
 	ProjectResource createProject(String projectName, String author);
+
+	ProjectResource getProject(String projectName);
 
 	List<Resource> getProjects(String author);	
 
@@ -40,4 +42,6 @@ public interface IProjectService {
 	void deleteResource(String projectName, String resourceId);
 
 	void deleteResource(String projectName, String author, String resourceId);
-}
+
+	void addReferenceToProject(String projectName, String resourceId);
+}