TEIIDDES-1518: Create interface for TeiidDataSource

* Makes the codebase more flexible and easier to create a common spi
Teiid-Designer · Dec 7, 2012 · fc9961b · fc9961b
1 parent 6a153c5
commit fc9961b
Show file tree

Hide file tree

Showing 20 changed files with 272 additions and 179 deletions.
diff --git a/plugins/org.teiid.designer.dqp.ui/plugin.xml b/plugins/org.teiid.designer.dqp.ui/plugin.xml
@@ -357,7 +357,7 @@
                type="org.teiid.designer.runtime.ui.views.content.ITeiidResourceNode">
          </adapter>
          <adapter
-               type="org.teiid.designer.runtime.TeiidDataSource">
+               type="org.teiid.designer.runtime.ITeiidDataSource">
          </adapter>
          <adapter
                type="org.teiid.designer.runtime.ITeiidTranslator">

diff --git a/...igner.dqp.ui/src/org/teiid/designer/runtime/ui/connection/SelectJndiDataSourceDialog.java b/...igner.dqp.ui/src/org/teiid/designer/runtime/ui/connection/SelectJndiDataSourceDialog.java
@@ -19,7 +19,7 @@
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
 import org.teiid.designer.runtime.DqpPlugin;
-import org.teiid.designer.runtime.TeiidDataSource;
+import org.teiid.designer.runtime.ITeiidDataSource;
 import org.teiid.designer.runtime.TeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.views.TeiidServerContentProvider;
@@ -42,7 +42,7 @@ public class SelectJndiDataSourceDialog extends ElementTreeSelectionDialog imple
 
     private Text dataSourceNameText;
     private MessageLabel statusMessageLabel;
-    private TeiidDataSource selectedDataSource;
+    private ITeiidDataSource selectedDataSource;
 
     public SelectJndiDataSourceDialog( Shell parent ) {
         super(parent, new TeiidServerLabelProvider(), new TeiidServerContentProvider(false, false, true));
@@ -111,8 +111,8 @@ public boolean select( Viewer viewer,
             public boolean select( Viewer viewer,
                                    Object parentElement,
                                    Object element ) {
-                if (element instanceof TeiidDataSource) {
-                    String name = ((TeiidDataSource)element).getName();
+                if (element instanceof ITeiidDataSource) {
+                    String name = ((ITeiidDataSource)element).getName();
                     return !name.startsWith(Vdb.PREVIEW_PREFIX);
                 }
 
@@ -135,11 +135,11 @@ public void selectionChanged( SelectionChangedEvent event ) {
 
         Object firstElement = selection.getFirstElement();
 
-        if (!(firstElement instanceof TeiidDataSource)) {
+        if (!(firstElement instanceof ITeiidDataSource)) {
             this.selectedDataSource = null;
             this.dataSourceNameText.setText(UNDEFINED);
         } else {
-            this.selectedDataSource = (TeiidDataSource)selection.getFirstElement();
+            this.selectedDataSource = (ITeiidDataSource)selection.getFirstElement();
             this.dataSourceNameText.setText(selectedDataSource.getName());
         }
 
@@ -151,7 +151,7 @@ private void updateOnSelection( Object selectedObject ) {
                                     DqpUiConstants.PLUGIN_ID,
                                     DqpUiConstants.UTIL.getString("SelectJndiDataSourceDialog.okSelectionMessage")); //$NON-NLS-1$
         if (selectedObject != null) {
-            if (!(selectedObject instanceof TeiidDataSource)) {
+            if (!(selectedObject instanceof ITeiidDataSource)) {
                 status = new Status(IStatus.ERROR,
                                     DqpUiConstants.PLUGIN_ID,
                                     DqpUiConstants.UTIL.getString("SelectJndiDataSourceDialog.invalidSelectionMessage")); //$NON-NLS-1$
@@ -174,7 +174,7 @@ private void updateOnSelection( Object selectedObject ) {
      * 
      * @return the TeiidDataSource. may return null
      */
-    public TeiidDataSource getSelectedTranslator() {
+    public ITeiidDataSource getSelectedTranslator() {
         return this.selectedDataSource;
     }
 

diff --git a/...igner.dqp.ui/src/org/teiid/designer/runtime/ui/connection/VdbSourceConnectionHandler.java b/...igner.dqp.ui/src/org/teiid/designer/runtime/ui/connection/VdbSourceConnectionHandler.java
@@ -26,8 +26,8 @@
 import org.teiid.designer.core.workspace.ModelWorkspaceException;
 import org.teiid.designer.metamodels.core.ModelType;
 import org.teiid.designer.runtime.DqpPlugin;
+import org.teiid.designer.runtime.ITeiidDataSource;
 import org.teiid.designer.runtime.ITeiidTranslator;
-import org.teiid.designer.runtime.TeiidDataSource;
 import org.teiid.designer.runtime.TeiidPropertyDefinition;
 import org.teiid.designer.runtime.TeiidServer;
 import org.teiid.designer.runtime.connection.ModelConnectionMapper;
@@ -141,7 +141,7 @@ public void run() {
 
                 SelectJndiDataSourceDialog dialog = new SelectJndiDataSourceDialog(Display.getCurrent().getActiveShell());
 
-                TeiidDataSource initialSelection = null;
+                ITeiidDataSource initialSelection = null;
                 TeiidServer defServer = getDefaultServer();
                 if (defServer != null && defServer.isConnected()) {
                     try {
@@ -158,8 +158,8 @@ public void run() {
 
                 if (dialog.getReturnCode() == Window.OK) {
                     Object result = dialog.getFirstResult();
-                    if (result != null && result instanceof TeiidDataSource) {
-                        vdbModelEntry.setJndiName(((TeiidDataSource)result).getName());
+                    if (result != null && result instanceof ITeiidDataSource) {
+                        vdbModelEntry.setJndiName(((ITeiidDataSource)result).getName());
                     }
                 }
             }
@@ -224,7 +224,7 @@ public String[] getDataSourceNames() {
         TeiidServer defaultServer = getDefaultServer();
 
         if ((defaultServer != null) && defaultServer.isConnected()) {
-            Collection<TeiidDataSource> dataSources = null;
+            Collection<ITeiidDataSource> dataSources = null;
 
             try {
                 dataSources = defaultServer.getDataSources();
@@ -237,7 +237,7 @@ public String[] getDataSourceNames() {
             if (dataSources != null) {
                 Collection<String> dataSourceNames = new ArrayList<String>();
 
-                for (TeiidDataSource dataSource : dataSources) {
+                for (ITeiidDataSource dataSource : dataSources) {
                     if (!dataSource.isPreview()) {
                         dataSourceNames.add(dataSource.getName());
                     }

diff --git a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/vdb/VdbDeployer.java b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/vdb/VdbDeployer.java
@@ -19,6 +19,7 @@
 import org.teiid.designer.core.util.StringUtilities;
 import org.teiid.designer.metamodels.core.ModelType;
 import org.teiid.designer.runtime.DqpPlugin;
+import org.teiid.designer.runtime.TeiidDataSourceFactory;
 import org.teiid.designer.runtime.TeiidServer;
 import org.teiid.designer.vdb.TranslatorOverride;
 import org.teiid.designer.vdb.Vdb;
@@ -234,7 +235,9 @@ public void run() {
                         if ((autoCreate || createOnServer) && (model != null)) {
                             monitor.subTask(UTIL.getString(PREFIX + "createModelDataSourceTask", modelName)); //$NON-NLS-1$
 
-                            if (teiidServer.getOrCreateDataSource(model,
+                            TeiidDataSourceFactory factory = new TeiidDataSourceFactory();
+                            if (factory.createDataSource(teiidServer,
+                                                                 model,
                                                                  jndiName,
                                                                  false,
                                                                  DqpPlugin.getInstance().getPasswordProvider()) == null) {

diff --git a/...id.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/TeiidServerActionProvider.java b/...id.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/TeiidServerActionProvider.java
@@ -33,9 +33,9 @@
 import org.eclipse.ui.navigator.ICommonViewerSite;
 import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
 import org.teiid.designer.runtime.DqpPlugin;
+import org.teiid.designer.runtime.ITeiidDataSource;
 import org.teiid.designer.runtime.ITeiidVdb;
 import org.teiid.designer.runtime.PreferenceConstants;
-import org.teiid.designer.runtime.TeiidDataSource;
 import org.teiid.designer.runtime.TeiidServer;
 import org.teiid.designer.runtime.TeiidServerManager;
 import org.teiid.designer.runtime.preview.PreviewManager;
@@ -266,7 +266,7 @@ public void run() {
             public void run() {
                 List<Object> selectedObjs = getSelectedObjects();
                 for (Object obj : selectedObjs) {
-                    TeiidDataSource tds = RuntimeAssistant.adapt(obj, TeiidDataSource.class);
+                    ITeiidDataSource tds = RuntimeAssistant.adapt(obj, ITeiidDataSource.class);
                     TeiidServer teiidServer = RuntimeAssistant.getServerFromSelection(selectionProvider.getSelection());
 
                     if (teiidServer != null && teiidServer.isConnected()) {
@@ -513,7 +513,7 @@ public void fillContextMenu(IMenuManager manager) {
                 manager.add(this.editServerAction);
                 manager.add(new Separator());
 
-            } else if (RuntimeAssistant.adapt(selection, TeiidDataSource.class) != null) {
+            } else if (RuntimeAssistant.adapt(selection, ITeiidDataSource.class) != null) {
                 manager.add(this.deleteDataSourceAction);                
                 manager.add(new Separator());
 
@@ -533,7 +533,7 @@ public void fillContextMenu(IMenuManager manager) {
             boolean allDataSources = true;
 
             for (Object obj : selectedObjs) {
-                if (RuntimeAssistant.adapt(obj, TeiidDataSource.class) == null) {
+                if (RuntimeAssistant.adapt(obj, ITeiidDataSource.class) == null) {
                     allDataSources = false;
                     break;
                 }

diff --git a/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/TeiidView.java b/plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/TeiidView.java
@@ -40,9 +40,9 @@
 import org.eclipse.wst.server.core.util.ServerLifecycleAdapter;
 import org.teiid.core.designer.util.I18nUtil;
 import org.teiid.designer.runtime.DqpPlugin;
+import org.teiid.designer.runtime.ITeiidDataSource;
 import org.teiid.designer.runtime.ITeiidTranslator;
 import org.teiid.designer.runtime.ITeiidVdb;
-import org.teiid.designer.runtime.TeiidDataSource;
 import org.teiid.designer.runtime.TeiidServerManager;
 import org.teiid.designer.runtime.adapter.TeiidServerAdapterUtil;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
@@ -104,7 +104,7 @@ public boolean select( Viewer viewer, Object parentElement, Object element ) {
          */
         @Override
         public boolean select( Viewer viewer, Object parentElement, Object element ) {
-            TeiidDataSource dataSource = RuntimeAssistant.adapt(element, TeiidDataSource.class);
+            ITeiidDataSource dataSource = RuntimeAssistant.adapt(element, ITeiidDataSource.class);
             if (dataSource != null && dataSource.isPreview())
                 return false;
 

diff --git a/...id.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/content/DataSourcesFolder.java b/...id.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/content/DataSourcesFolder.java
@@ -8,13 +8,13 @@
 package org.teiid.designer.runtime.ui.views.content;
 
 import java.util.Collection;
-import org.teiid.designer.runtime.TeiidDataSource;
+import org.teiid.designer.runtime.ITeiidDataSource;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 
 /**
  * @since 8.0
  */
-public class DataSourcesFolder extends AbstractTeiidFolder<TeiidDataSource> {
+public class DataSourcesFolder extends AbstractTeiidFolder<ITeiidDataSource> {
 
     private static final String DATA_SOURCES_FOLDER_NAME = DqpUiConstants.UTIL.getString(DataSourcesFolder.class.getSimpleName() + ".label"); //$NON-NLS-1$
 
@@ -24,7 +24,7 @@ public class DataSourcesFolder extends AbstractTeiidFolder<TeiidDataSource> {
      * @param parentNode
      * @param values
      */
-    public DataSourcesFolder(TeiidServerContainerNode parentNode, Collection<TeiidDataSource> values ) {
+    public DataSourcesFolder(TeiidServerContainerNode parentNode, Collection<ITeiidDataSource> values ) {
         super(parentNode, values);
     }
 

diff --git a/....teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/content/TeiidDataNode.java b/....teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/content/TeiidDataNode.java
@@ -10,6 +10,7 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.wst.server.core.IServer;
 import org.teiid.core.designer.util.I18nUtil;
+import org.teiid.designer.runtime.ITeiidDataSource;
 import org.teiid.designer.runtime.ITeiidTranslator;
 import org.teiid.designer.runtime.ITeiidVdb;
 import org.teiid.designer.runtime.TeiidDataSource;
@@ -81,11 +82,11 @@ public void dispose() {
 
     @Override
     public String getName() {
-        if (value instanceof TeiidDataSource) {
-            if (((TeiidDataSource) value).getDisplayName() != null) {
-                return ((TeiidDataSource) value).getDisplayName();
+        if (value instanceof ITeiidDataSource) {
+            if (((ITeiidDataSource) value).getDisplayName() != null) {
+                return ((ITeiidDataSource) value).getDisplayName();
             }
-            return ((TeiidDataSource) value).getName();
+            return ((ITeiidDataSource) value).getName();
         }
 
         if (value instanceof ITeiidTranslator) {
@@ -156,7 +157,7 @@ public Image getImage() {
             return DqpUiPlugin.getDefault().getAnImage(DqpUiConstants.Images.CONNECTOR_BINDING_ICON);
         }
 
-        if (value instanceof TeiidDataSource) {
+        if (value instanceof ITeiidDataSource) {
             return DqpUiPlugin.getDefault().getAnImage(DqpUiConstants.Images.CONNECTION_SOURCE_ICON);
         }
 

diff --git a/...gner.dqp.ui/src/org/teiid/designer/runtime/ui/views/content/TeiidServerContainerNode.java b/...gner.dqp.ui/src/org/teiid/designer/runtime/ui/views/content/TeiidServerContainerNode.java
@@ -12,9 +12,9 @@
 import java.util.Collections;
 import java.util.List;
 import org.eclipse.wst.server.core.IServer;
+import org.teiid.designer.runtime.ITeiidDataSource;
 import org.teiid.designer.runtime.ITeiidTranslator;
 import org.teiid.designer.runtime.ITeiidVdb;
-import org.teiid.designer.runtime.TeiidDataSource;
 import org.teiid.designer.runtime.TeiidServer;
 import org.teiid.designer.runtime.ui.DqpUiConstants;
 import org.teiid.designer.runtime.ui.views.TeiidServerContentProvider;
@@ -105,7 +105,7 @@ public final void load() {
         try {
             // hide Data Sources related variables from other local variables
             DATA_SOURCES: {
-                Collection<TeiidDataSource> dataSources;
+                Collection<ITeiidDataSource> dataSources;
 
                 if (provider.isShowDataSources()) {
                     dataSources = new ArrayList(teiidServer.getDataSources());

diff --git a/.../src/org/teiid/designer/runtime/ui/views/content/adapter/TeiidDataNodeAdapterFactory.java b/.../src/org/teiid/designer/runtime/ui/views/content/adapter/TeiidDataNodeAdapterFactory.java
@@ -8,9 +8,9 @@
 package org.teiid.designer.runtime.ui.views.content.adapter;
 
 import org.eclipse.core.runtime.IAdapterFactory;
+import org.teiid.designer.runtime.ITeiidDataSource;
 import org.teiid.designer.runtime.ITeiidTranslator;
 import org.teiid.designer.runtime.ITeiidVdb;
-import org.teiid.designer.runtime.TeiidDataSource;
 import org.teiid.designer.runtime.ui.views.content.ITeiidResourceNode;
 import org.teiid.designer.runtime.ui.views.content.TeiidDataNode;
 
@@ -29,7 +29,7 @@ public Object getAdapter(Object adaptableObject, Class adapterType) {
         if (ITeiidResourceNode.class == adapterType)
             return adaptToTeiidResourceNode(teiidDataNode);
 
-        if (TeiidDataSource.class == adapterType ||
+        if (ITeiidDataSource.class == adapterType ||
             ITeiidTranslator.class == adapterType ||
             ITeiidVdb.class == adapterType) {
 
@@ -57,7 +57,7 @@ private Object adaptToTeiidResourceNode(TeiidDataNode teiidDataNode) {
     @Override
     public Class[] getAdapterList() {
         return new Class[] { ITeiidResourceNode.class, 
-                                           TeiidDataSource.class,
+                                           ITeiidDataSource.class,
                                            ITeiidTranslator.class,
                                            ITeiidVdb.class };
     }

diff --git a/...ns/org.teiid.designer.dqp/src/org/teiid/designer/runtime/ExecutionConfigurationEvent.java b/...ns/org.teiid.designer.dqp/src/org/teiid/designer/runtime/ExecutionConfigurationEvent.java
@@ -20,7 +20,7 @@
  */
 public final class ExecutionConfigurationEvent {
 
-    public static ExecutionConfigurationEvent createAddDataSourceEvent( TeiidDataSource dataSource ) {
+    public static ExecutionConfigurationEvent createAddDataSourceEvent( ITeiidDataSource dataSource ) {
         return new ExecutionConfigurationEvent(EventType.ADD, TargetType.DATA_SOURCE, dataSource);
     }
 
@@ -32,7 +32,7 @@ public static ExecutionConfigurationEvent createDeployVDBEvent( String vdbName )
         return new ExecutionConfigurationEvent(EventType.ADD, TargetType.VDB, vdbName);
     }
 
-    public static ExecutionConfigurationEvent createRemoveDataSourceEvent( TeiidDataSource dataSource ) {
+    public static ExecutionConfigurationEvent createRemoveDataSourceEvent( ITeiidDataSource dataSource ) {
         return new ExecutionConfigurationEvent(EventType.REMOVE, TargetType.DATA_SOURCE, dataSource);
     }
 
@@ -53,7 +53,7 @@ public static ExecutionConfigurationEvent createUnDeployVDBEvent( String vdbName
         return new ExecutionConfigurationEvent(EventType.REMOVE, TargetType.VDB, vdbName);
     }
 
-    public static ExecutionConfigurationEvent createUpdateDataSourceEvent( TeiidDataSource dataSource ) {
+    public static ExecutionConfigurationEvent createUpdateDataSourceEvent( ITeiidDataSource dataSource ) {
         return new ExecutionConfigurationEvent(EventType.UPDATE, TargetType.DATA_SOURCE, dataSource);
     }
 
@@ -102,14 +102,14 @@ private ExecutionConfigurationEvent( TargetType targetType ) {
      * @return the connector involved in the event
      * @throws IllegalStateException if method is called for a server event
      */
-    public TeiidDataSource getDataSource() {
+    public ITeiidDataSource getDataSource() {
         if (this.targetType != TargetType.DATA_SOURCE) {
             throw new IllegalStateException(Util.getString("invalidTargetTypeForGetDataSourceMethod", //$NON-NLS-1$
                                                            this.targetType,
                                                            TargetType.DATA_SOURCE));
         }
 
-        return (TeiidDataSource)this.target;
+        return (ITeiidDataSource)this.target;
     }
 
     /**