forked from eclipse/vorto
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactored editor service interface. Showing function block models in…
… search results of function block editor browser window Signed-off-by: shiv12095 <shiv12095@iiitd.ac.in>
- Loading branch information
Showing
10 changed files
with
132 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 0 additions & 17 deletions
17
...l/src/main/java/org/eclipse/vorto/server/devtool/service/IFunctionBlockEditorService.java
This file was deleted.
Oops, something went wrong.
16 changes: 0 additions & 16 deletions
16
...rc/main/java/org/eclipse/vorto/server/devtool/service/IInformationModelEditorService.java
This file was deleted.
Oops, something went wrong.
44 changes: 44 additions & 0 deletions
44
.../java/org/eclipse/vorto/server/devtool/service/editor/FunctionBlockEditorServiceImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package org.eclipse.vorto.server.devtool.service.editor; | ||
|
|
||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| import org.eclipse.emf.common.util.URI; | ||
| import org.eclipse.emf.ecore.resource.Resource; | ||
| import org.eclipse.emf.ecore.resource.ResourceSet; | ||
| import org.eclipse.vorto.http.model.ModelId; | ||
| import org.eclipse.vorto.http.model.ModelResource; | ||
| import org.eclipse.vorto.server.devtool.utils.DevtoolReferenceLinker; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| @Service | ||
| public class FunctionBlockEditorServiceImpl extends IEditorService { | ||
|
|
||
| @Autowired | ||
| DevtoolReferenceLinker devtoolReferenceLinker; | ||
|
|
||
| public String linkModelToResource(String functionBlockResourceId, ModelId datatypeModelId, | ||
| ResourceSet resourceSet, Set<String> referencedResourceSet) { | ||
| devtoolReferenceLinker.linkDataTypeToFunctionBlock(functionBlockResourceId, datatypeModelId, | ||
| resourceSet, referencedResourceSet); | ||
| Resource functionBlockResource = resourceSet.getResource(URI.createURI(functionBlockResourceId), true); | ||
| try { | ||
| ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); | ||
| functionBlockResource.save(byteArrayOutputStream, null); | ||
| return byteArrayOutputStream.toString(); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| public List<ModelResource> searchModelByExpression(String expression) { | ||
| List<ModelResource> modelList = searchModelByExpressionAndValidate(expression + " " + org.eclipse.vorto.http.model.ModelType.Datatype.toString() , org.eclipse.vorto.http.model.ModelType.Datatype); | ||
| List<ModelResource> functionBlockModelList = searchModelByExpressionAndValidate(expression + " " + org.eclipse.vorto.http.model.ModelType.Functionblock.toString(), org.eclipse.vorto.http.model.ModelType.Functionblock); | ||
| modelList.addAll(functionBlockModelList); | ||
| return modelList; | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
...devtool/src/main/java/org/eclipse/vorto/server/devtool/service/editor/IEditorService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package org.eclipse.vorto.server.devtool.service.editor; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| import org.eclipse.emf.ecore.resource.ResourceSet; | ||
| import org.eclipse.vorto.http.model.ModelId; | ||
| import org.eclipse.vorto.http.model.ModelResource; | ||
| import org.eclipse.vorto.server.devtool.utils.DevtoolRestClient; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| @Service | ||
| public abstract class IEditorService { | ||
|
|
||
| @Autowired | ||
| DevtoolRestClient devtoolRestClient; | ||
|
|
||
| public abstract String linkModelToResource(String infoModelResourceId, ModelId modelId, ResourceSet resourceSet, | ||
| Set<String> referencedResourceSet); | ||
|
|
||
| public abstract List<ModelResource> searchModelByExpression(String expression); | ||
|
|
||
| protected final List<ModelResource> searchModelByExpressionAndValidate(String expression, | ||
| org.eclipse.vorto.http.model.ModelType modelType) { | ||
| List<ModelResource> resourceList = devtoolRestClient.searchByExpression(expression); | ||
| ArrayList<ModelResource> modelResourceList = new ArrayList<ModelResource>(); | ||
| for (ModelResource modelResource : resourceList) { | ||
| if (modelResource.getModelType().equals(modelType)) { | ||
| modelResourceList.add(modelResource); | ||
| } | ||
| } | ||
| return modelResourceList; | ||
| } | ||
| } |
40 changes: 40 additions & 0 deletions
40
...va/org/eclipse/vorto/server/devtool/service/editor/InformationModelEditorServiceImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package org.eclipse.vorto.server.devtool.service.editor; | ||
|
|
||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| import org.eclipse.emf.common.util.URI; | ||
| import org.eclipse.emf.ecore.resource.Resource; | ||
| import org.eclipse.emf.ecore.resource.ResourceSet; | ||
| import org.eclipse.vorto.http.model.ModelId; | ||
| import org.eclipse.vorto.http.model.ModelResource; | ||
| import org.eclipse.vorto.server.devtool.utils.DevtoolReferenceLinker; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| @Service | ||
| public class InformationModelEditorServiceImpl extends IEditorService { | ||
|
|
||
| @Autowired | ||
| DevtoolReferenceLinker devtoolReferenceLinker; | ||
|
|
||
| public String linkModelToResource(String infoModelResourceId, ModelId functionBlockModelId, | ||
| ResourceSet resourceSet, Set<String> referencedResourceSet) { | ||
| devtoolReferenceLinker.linkFunctionBlockToInfoModel(infoModelResourceId, functionBlockModelId, | ||
| resourceSet, referencedResourceSet); | ||
| Resource infoModelResource = resourceSet.getResource(URI.createURI(infoModelResourceId), true); | ||
| try { | ||
| ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); | ||
| infoModelResource.save(byteArrayOutputStream, null); | ||
| return byteArrayOutputStream.toString(); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| public List<ModelResource> searchModelByExpression(String expression) { | ||
| return searchModelByExpressionAndValidate(expression + org.eclipse.vorto.http.model.ModelType.Functionblock.toString(), org.eclipse.vorto.http.model.ModelType.Functionblock); | ||
| } | ||
| } |
61 changes: 0 additions & 61 deletions
61
...in/java/org/eclipse/vorto/server/devtool/service/impl/FunctionBlockEditorServiceImpl.java
This file was deleted.
Oops, something went wrong.
60 changes: 0 additions & 60 deletions
60
...java/org/eclipse/vorto/server/devtool/service/impl/InformationModelEditorServiceImpl.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters