Skip to content

Commit

Permalink
TEIIDDES-1719 Changed action to add includes and excludes procedures …
Browse files Browse the repository at this point in the history 
…to selected relational model with SF extensions
  • Loading branch information
@blafond
blafond committed Jun 5, 2013
1 parent db87cc0 commit fee704c
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 40 deletions.
3 changes: 2 additions & 1 deletion plugins/org.teiid.designer.modelgenerator.salesforce.ui/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ Require-Bundle: org.teiid.designer.modelgenerator.salesforce;bundle-version="[8.
org.teiid.designer.datatools.ui;bundle-version="[8.1.0,9.0.0)",
org.teiid.designer.metamodels.function;bundle-version="[8.1.0,9.0.0)",
org.eclipse.datatools.help;bundle-version="[1.5.0,2.0.0)",
org.teiid.designer.extension;bundle-version="[8.1.0,9.0.0)"
org.teiid.designer.extension;bundle-version="[8.1.0,9.0.0)",
org.teiid.designer.relational;bundle-version="8.1.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.teiid.designer.modelgenerator.salesforce.ui,
org.teiid.designer.modelgenerator.salesforce.ui.actions,
Expand Down
4 changes: 2 additions & 2 deletions plugins/org.teiid.designer.modelgenerator.salesforce.ui/plugin.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pluginProvider = JBoss by Red Hat
use.jdk150 = yes
wizardDescription = Create Relational Model from Salesforce objects via Data Tools Salesforce connection profile.
wizardName = Salesforce >> Source Model
CreateSalesForceFunctionsAction.name=Create SalesForce Function Model
CreateSalesForceFunctionsAction.label=Create SalesForce Function Model
CreateSalesForceFunctionsAction.name=Add SalesForce Pushdown Functions
CreateSalesForceFunctionsAction.label=Add SalesForce Pushdown Functions

connectionProperties.name = Connection Properties
83 changes: 46 additions & 37 deletions .../teiid/designer/modelgenerator/salesforce/ui/actions/CreateSalesForceFunctionsAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
Expand All @@ -24,19 +24,17 @@
import org.eclipse.ui.actions.WorkspaceModifyOperation;
import org.teiid.designer.core.ModelerCore;
import org.teiid.designer.core.workspace.ModelResource;
import org.teiid.designer.core.workspace.ModelUtil;
import org.teiid.designer.core.workspace.ModelWorkspaceException;
import org.teiid.designer.extension.ExtensionPlugin;
import org.teiid.designer.extension.definition.ModelObjectExtensionAssistant;
import org.teiid.designer.metamodels.core.ModelAnnotation;
import org.teiid.designer.metamodels.core.ModelType;
import org.teiid.designer.metamodels.function.FunctionFactory;
import org.teiid.designer.metamodels.function.FunctionPackage;
import org.teiid.designer.metamodels.function.FunctionParameter;
import org.teiid.designer.metamodels.function.PushDownType;
import org.teiid.designer.metamodels.function.ReturnParameter;
import org.teiid.designer.metamodels.function.ScalarFunction;
import org.teiid.designer.metamodels.relational.DirectionKind;
import org.teiid.designer.metamodels.relational.Procedure;
import org.teiid.designer.metamodels.relational.ProcedureParameter;
import org.teiid.designer.metamodels.relational.RelationalFactory;
import org.teiid.designer.modelgenerator.salesforce.ui.Activator;
import org.teiid.designer.modelgenerator.salesforce.ui.ModelGeneratorSalesforceUiConstants;
import org.teiid.designer.relational.model.DatatypeProcessor;
import org.teiid.designer.ui.UiConstants;
import org.teiid.designer.ui.actions.SortableSelectionAction;
import org.teiid.designer.ui.common.eventsupport.SelectionUtilities;
Expand All @@ -49,7 +47,7 @@
* @since 8.0
*/
public class CreateSalesForceFunctionsAction extends SortableSelectionAction {

private DatatypeProcessor datatypeProcessor;
/**
*
*/
Expand Down Expand Up @@ -116,6 +114,8 @@ private boolean sourceModelSelected( ISelection theSelection ) {
*/
@Override
public void run() {
this.datatypeProcessor = new DatatypeProcessor();

final WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
@Override
public void execute( final IProgressMonitor theMonitor ) {
Expand All @@ -125,15 +125,11 @@ public void execute( final IProgressMonitor theMonitor ) {
boolean succeeded = false;
try {
IFile modelFile = (IFile)SelectionUtilities.getSelectedObjects(getSelection()).get(0);
IFile file = modelFile.getParent().getFile(new Path("SalesforceFunctions.xmi")); //$NON-NLS-1$
theMonitor.beginTask(taskName, IProgressMonitor.UNKNOWN);
final ModelResource modelResource = ModelerCore.create(file);
final ModelResource modelResource = ModelUtil.getModelResource(modelFile, true);
theMonitor.worked(1000);
if (modelResource != null) {
final ModelAnnotation modelAnnotation = modelResource.getModelAnnotation();
modelAnnotation.setPrimaryMetamodelUri(FunctionPackage.eNS_URI);
modelAnnotation.setModelType(ModelType.FUNCTION_LITERAL);
createFunctions(modelResource, theMonitor);
createPushdownFunctions(modelResource, theMonitor);
modelResource.save(theMonitor, false);
}

Expand Down Expand Up @@ -164,9 +160,9 @@ public void execute( final IProgressMonitor theMonitor ) {
/**
* @param modelResource
*/
protected void createFunctions( ModelResource modelResource,
protected void createPushdownFunctions( ModelResource modelResource,
IProgressMonitor theMonitor ) throws ModelWorkspaceException {
ScalarFunction function = createIncludesFunction();
Procedure function = createIncludesFunction();
modelResource.getEmfResource().getContents().add(function);
theMonitor.worked(1000);
function = createExcludesFunction();
Expand All @@ -178,8 +174,8 @@ protected void createFunctions( ModelResource modelResource,
* @param createFunction
* @return
*/
private ScalarFunction createExcludesFunction() {
ScalarFunction function = createCommonProps();
private Procedure createExcludesFunction() {
Procedure function = createCommonProps();
function.setName("excludes"); //$NON-NLS-1$
return function;
}
Expand All @@ -188,32 +184,45 @@ private ScalarFunction createExcludesFunction() {
* @param createFunction
* @return
*/
private ScalarFunction createIncludesFunction() {
ScalarFunction function = createCommonProps();
private Procedure createIncludesFunction() {
Procedure function = createCommonProps();
function.setName("includes"); //$NON-NLS-1$
return function;
}

private ScalarFunction createCommonProps() {
ScalarFunction function = FunctionFactory.eINSTANCE.createScalarFunction();
function.setCategory("SalesForce"); //$NON-NLS-1$
function.setPushDown(PushDownType.REQUIRED_LITERAL);
function.setInvocationClass("None"); //$NON-NLS-1$
function.setInvocationMethod("None"); //$NON-NLS-1$
private Procedure createCommonProps() {
Procedure function = RelationalFactory.eINSTANCE.createProcedure();
function.setFunction(true);

EObject stringDatatype = this.datatypeProcessor.findDatatype("string"); //$NON-NLS-1$

FunctionParameter param = FunctionFactory.eINSTANCE.createFunctionParameter();
ProcedureParameter param = RelationalFactory.eINSTANCE.createProcedureParameter();
param.setName("columnName"); //$NON-NLS-1$
param.setType("string"); //$NON-NLS-1$
function.getInputParameters().add(param);
if( stringDatatype != null ) {
param.setType(stringDatatype);
param.setLength(DatatypeProcessor.DEFAULT_DATATYPE_LENGTH);
}
param.setDirection(DirectionKind.IN_LITERAL);
function.getParameters().add(param);

param = FunctionFactory.eINSTANCE.createFunctionParameter();
param = RelationalFactory.eINSTANCE.createProcedureParameter();
param.setName("param"); //$NON-NLS-1$
param.setType("string"); //$NON-NLS-1$
function.getInputParameters().add(param);

ReturnParameter result = FunctionFactory.eINSTANCE.createReturnParameter();
result.setType("boolean"); //$NON-NLS-1$
function.setReturnParameter(result);
if( stringDatatype != null ) {
param.setType(stringDatatype);
param.setLength(DatatypeProcessor.DEFAULT_DATATYPE_LENGTH);
}
param.setDirection(DirectionKind.IN_LITERAL);
function.getParameters().add(param);

ProcedureParameter result = RelationalFactory.eINSTANCE.createProcedureParameter();
result.setDirection(DirectionKind.RETURN_LITERAL);
EObject booleanDatatype = this.datatypeProcessor.findDatatype("boolean"); //$NON-NLS-1$
if( booleanDatatype != null ) {
result.setType(booleanDatatype);
}
result.setName("returnParam"); //$NON-NLS-1$
function.getParameters().add(result);
return function;
}
}

0 comments on commit fee704c

Please sign in to comment.