TEIIDDES-2959 (cntd)

* fixed issue with accessing both data source and translator property definitions.
Teiid-Designer · Jul 14, 2017 · c9a738b · c9a738b
1 parent 33f2c59
commit c9a738b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/.../teiid/org.teiid.runtime.client/src/org/teiid/runtime/client/admin/ConnectionManager.java b/.../teiid/org.teiid.runtime.client/src/org/teiid/runtime/client/admin/ConnectionManager.java
@@ -202,7 +202,11 @@ public ITeiidTranslator getTranslator(String name) {
     public Collection<ITeiidTranslator> getTranslators() {
     	return this.translatorCache.getTranslators();
     }
+
     public Collection<TeiidPropertyDefinition> getTemplatePropertyDefns(String templateName) throws Exception {
-    	return this.translatorCache.getTemplatePropertyDefns(templateName);
+    	Collection<TeiidPropertyDefinition> result = new ArrayList<TeiidPropertyDefinition>();
+    	result.addAll(this.translatorCache.getTemplatePropertyDefns(templateName));
+    	result.addAll(dataSourceCache.getTemplatePropertyDefns(templateName));
+    	return result;
     }
 }
diff --git a/...teiid/org.teiid.runtime.client/src/org/teiid/runtime/client/admin/v8/DataSourceCache.java b/...teiid/org.teiid.runtime.client/src/org/teiid/runtime/client/admin/v8/DataSourceCache.java
@@ -21,6 +21,7 @@
 import org.teiid.adminapi.jboss.MetadataMapper;
 import org.teiid.designer.runtime.spi.ITeiidDataSource;
 import org.teiid.designer.runtime.spi.ITeiidServer;
+import org.teiid.designer.runtime.spi.TeiidPropertyDefinition;
 import org.teiid.designer.runtime.version.spi.ITeiidServerVersion;
 import org.teiid.runtime.client.Messages;
 import org.teiid.runtime.client.TeiidRuntimePlugin;
@@ -296,6 +297,36 @@ private Collection<PropertyDefinition> loadTemplatePropertyDefinition(String tem
     	return props;
 	}
 
+    @SuppressWarnings("unchecked")
+	public Collection<TeiidPropertyDefinition> getTemplatePropertyDefns(String templateName) throws Exception {
+
+        Collection<? extends PropertyDefinition> propDefs = getTemplatePropertyDefinitions(templateName);
+
+        Collection<TeiidPropertyDefinition> teiidPropDefns = new ArrayList<TeiidPropertyDefinition>();
+
+        for (PropertyDefinition propDefn : propDefs) {
+            TeiidPropertyDefinition teiidPropertyDefn = new TeiidPropertyDefinition();
+
+            teiidPropertyDefn.setName(propDefn.getName());
+            teiidPropertyDefn.setDisplayName(propDefn.getDisplayName());
+            teiidPropertyDefn.setDescription(propDefn.getDescription());
+            teiidPropertyDefn.setPropertyTypeClassName(propDefn.getPropertyTypeClassName());
+            teiidPropertyDefn.setDefaultValue(propDefn.getDefaultValue());
+            teiidPropertyDefn.setAllowedValues(propDefn.getAllowedValues());
+            teiidPropertyDefn.setModifiable(propDefn.isModifiable());
+            teiidPropertyDefn.setConstrainedToAllowedValues(propDefn.isConstrainedToAllowedValues());
+            teiidPropertyDefn.setAdvanced(propDefn.isAdvanced());
+            teiidPropertyDefn.setRequired(propDefn.isRequired());
+            teiidPropertyDefn.setMasked(propDefn.isMasked());
+
+            teiidPropDefns.add(teiidPropertyDefn);
+        }
+
+        return teiidPropDefns;
+}
+
+
+
 	class AbstractMetadatMapper implements MetadataMapper<String>{
 		@Override
 		public String unwrap(ITeiidServerVersion teiidVersion, ModelNode node) {