TEIIDDES-2863 - upgrade to Teiid 9.0 client for wildfly support

Teiid-Designer · Aug 11, 2016 · 683df8d · 683df8d
1 parent 9341f01
commit 683df8d
Show file tree

Hide file tree

Showing 205 changed files with 24,922 additions and 3,931 deletions.
diff --git a/plugins/org.teiid.designer.spi/src/org/teiid/designer/query/AbstractLanguageVisitor.java b/plugins/org.teiid.designer.spi/src/org/teiid/designer/query/AbstractLanguageVisitor.java
@@ -7,13 +7,13 @@
 */
 package org.teiid.designer.query;
 
-import org.teiid.designer.annotation.Since;
 import org.teiid.designer.query.sql.ILanguageVisitor;
 import org.teiid.designer.query.sql.lang.IAlterProcedure;
 import org.teiid.designer.query.sql.lang.IAlterTrigger;
 import org.teiid.designer.query.sql.lang.IAlterView;
 import org.teiid.designer.query.sql.lang.IArrayTable;
 import org.teiid.designer.query.sql.lang.IBetweenCriteria;
+import org.teiid.designer.query.sql.lang.ICall;
 import org.teiid.designer.query.sql.lang.ICompareCriteria;
 import org.teiid.designer.query.sql.lang.ICompoundCriteria;
 import org.teiid.designer.query.sql.lang.ICreate;
@@ -32,6 +32,7 @@
 import org.teiid.designer.query.sql.lang.IJoinType;
 import org.teiid.designer.query.sql.lang.ILimit;
 import org.teiid.designer.query.sql.lang.IMatchCriteria;
+import org.teiid.designer.query.sql.lang.INamedProcedureCall;
 import org.teiid.designer.query.sql.lang.INotCriteria;
 import org.teiid.designer.query.sql.lang.IObjectTable;
 import org.teiid.designer.query.sql.lang.IOption;
@@ -107,6 +108,10 @@ public abstract class AbstractLanguageVisitor implements ILanguageVisitor {
     public void visit(IBetweenCriteria obj) {
     }
 
+    @Override
+    public void visit(ICall obj) {
+    }
+
     @Override
     public void visit(ICaseExpression obj) {
     }
@@ -371,12 +376,10 @@ public void visit(ITextLine obj) {
     public void visit(IXMLTable obj) {
     }
 
-    @Since(Version.TEIID_8_10)
     @Override
     public void visit(IXMLExists obj) {
     }
 
-    @Since(Version.TEIID_8_10)
     @Override
     public void visit(IXMLCast obj) {
     }
@@ -452,4 +455,8 @@ public void visit(IReturnStatement returnStatement) {
     @Override
     public void visit(IWindowSpecification windowSpecification) {
     }
+
+    @Override
+    public void visit(INamedProcedureCall namedProcedureCall) {
+    }
 }
diff --git a/...org.teiid.designer.spi/src/org/teiid/designer/query/metadata/IQueryMetadataInterface.java b/...org.teiid.designer.spi/src/org/teiid/designer/query/metadata/IQueryMetadataInterface.java
@@ -14,7 +14,6 @@
 import java.util.Properties;
 import java.util.Set;
 import javax.script.ScriptEngine;
-import org.teiid.designer.annotation.Since;
 import org.teiid.designer.annotation.Updated;
 import org.teiid.designer.runtime.version.spi.ITeiidServerVersion;
 import org.teiid.designer.runtime.version.spi.TeiidServerVersion.Version;
@@ -879,6 +878,5 @@ private Element() {}
     /**
      * @return the widen comparison to string flag
      */
-    @Since(Version.TEIID_8_12_4)
     boolean widenComparisonToString();
 }
diff --git a/plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/ILanguageVisitor.java b/plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/ILanguageVisitor.java
@@ -7,12 +7,12 @@
 */
 package org.teiid.designer.query.sql;
 
-import org.teiid.designer.annotation.Since;
 import org.teiid.designer.query.sql.lang.IAlterProcedure;
 import org.teiid.designer.query.sql.lang.IAlterTrigger;
 import org.teiid.designer.query.sql.lang.IAlterView;
 import org.teiid.designer.query.sql.lang.IArrayTable;
 import org.teiid.designer.query.sql.lang.IBetweenCriteria;
+import org.teiid.designer.query.sql.lang.ICall;
 import org.teiid.designer.query.sql.lang.ICompareCriteria;
 import org.teiid.designer.query.sql.lang.ICompoundCriteria;
 import org.teiid.designer.query.sql.lang.ICreate;
@@ -31,6 +31,7 @@
 import org.teiid.designer.query.sql.lang.IJoinType;
 import org.teiid.designer.query.sql.lang.ILimit;
 import org.teiid.designer.query.sql.lang.IMatchCriteria;
+import org.teiid.designer.query.sql.lang.INamedProcedureCall;
 import org.teiid.designer.query.sql.lang.INotCriteria;
 import org.teiid.designer.query.sql.lang.IObjectTable;
 import org.teiid.designer.query.sql.lang.IOption;
@@ -106,6 +107,7 @@ public interface ILanguageVisitor {
 
     // Visitor methods for language objects
     void visit(IBetweenCriteria obj);
+    void visit(ICall obj);
     void visit(ICaseExpression obj);
     void visit(ICompareCriteria obj);
     void visit(ICompoundCriteria obj);
@@ -120,6 +122,7 @@ public interface ILanguageVisitor {
     void visit(IJoinType obj);
     void visit(ILimit obj);
     void visit(IMatchCriteria obj);
+    void visit(INamedProcedureCall obj);
     void visit(INotCriteria obj);
     void visit(IOption obj);
     void visit(IOrderBy obj);
@@ -146,7 +149,6 @@ public interface ILanguageVisitor {
     void visit(IElementSymbol obj);
     void visit(IExpressionSymbol obj);
 
-    @Since(Version.TEIID_8_12_4)
     void visit(IIsDistinctCriteria obj);
 
     void visit(IFunction obj);
@@ -179,13 +181,8 @@ public interface ILanguageVisitor {
     void visit(ITextTable obj);
     void visit(ITextLine obj);
     void visit(IXMLTable obj);
-
-    @Since(Version.TEIID_8_10)
     void visit(IXMLExists obj);
-
-    @Since(Version.TEIID_8_10)
     void visit(IXMLCast obj);
-
     void visit(IDerivedColumn obj);
     void visit(IXMLSerialize obj);
     void visit(IXMLQuery obj);

diff --git a/...signer/query/sql/INamedProcedureCall.java → ...r/query/sql/lang/INamedProcedureCall.java b/...signer/query/sql/INamedProcedureCall.java → ...r/query/sql/lang/INamedProcedureCall.java
@@ -5,7 +5,7 @@
 *
 * See the AUTHORS.txt file distributed with this work for a full listing of individual contributors.
 */
-package org.teiid.designer.query.sql;
+package org.teiid.designer.query.sql.lang;
 
 /**
  * Represents a procedure call that returns a table.

diff --git a/plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/lang/IObjectTable.java b/plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/lang/IObjectTable.java
@@ -14,7 +14,6 @@
 /**
  *
  */
-@Since(Version.TEIID_8_0)
 public interface IObjectTable<LV extends ILanguageVisitor> extends ITableFunctionReference<LV>{
 
 }
diff --git a/...ns/org.teiid.designer.spi/src/org/teiid/designer/query/sql/proc/IExceptionExpression.java b/...ns/org.teiid.designer.spi/src/org/teiid/designer/query/sql/proc/IExceptionExpression.java
@@ -15,7 +15,6 @@
 /**
  *
  */
-@Since(Version.TEIID_8_0)
 public interface IExceptionExpression<LV extends ILanguageVisitor> extends IExpression<LV> {
 
 }
diff --git a/plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/proc/IReturnStatement.java b/plugins/org.teiid.designer.spi/src/org/teiid/designer/query/sql/proc/IReturnStatement.java
@@ -15,7 +15,6 @@
 /**
  *
  */
-@Since(Version.TEIID_8_0)
 public interface IReturnStatement<E extends IExpression, LV extends ILanguageVisitor>
     extends IAssignmentStatement<E, LV> {
 

diff --git a/...org.teiid.runtime.client/engine/org/teiid/query/resolver/command/SimpleQueryResolver.java b/...org.teiid.runtime.client/engine/org/teiid/query/resolver/command/SimpleQueryResolver.java
@@ -200,7 +200,7 @@ public void resolveWith(TempMetadataAdapter metadata,
                             || setQuery.getOption() != null) {
                         throw e;
                     }
-                    getQueryResolver().resolveCommand(queryExpression, metadata.getMetadata(), false);
+                    getQueryResolver().resolveCommand(setQuery.getLeftQuery(), metadata.getMetadata(), false);
                     recursive = setQuery.getRightQuery();
                 }
             } else {

diff --git a/plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/symbol/Symbol.java b/plugins/teiid/org.teiid.runtime.client/engine/org/teiid/query/sql/symbol/Symbol.java
@@ -193,5 +193,19 @@ public Symbol clone() {
 
         return clone;
     }
-
+
+
+	public static String getName(Expression ex) {
+		if (ex instanceof Symbol) {
+			return ((Symbol)ex).getName();
+		}
+		return "expr"; //$NON-NLS-1$
+	}
+
+	public static String getOutputName(Expression ex) {
+		if (ex instanceof Symbol) {
+			return ((Symbol)ex).getOutputName();
+		}
+		return "expr"; //$NON-NLS-1$
+	}
 }
diff --git a/plugins/teiid/org.teiid.runtime.client_v9/admin/org/teiid/adminapi/Admin.java b/plugins/teiid/org.teiid.runtime.client_v9/admin/org/teiid/adminapi/Admin.java
@@ -29,7 +29,6 @@
 import java.util.Set;
 import org.teiid.adminapi.VDB.ConnectionType;
 import org.teiid.designer.annotation.Removed;
-import org.teiid.designer.annotation.Since;
 import org.teiid.designer.runtime.version.spi.TeiidServerVersion.Version;
 
 public interface Admin {
@@ -38,7 +37,6 @@ public enum Cache {PREPARED_PLAN_CACHE, QUERY_SERVICE_RESULT_SET_CACHE};
 
 	public enum SchemaObjectType {TABLES, PROCEDURES, FUNCTIONS};
 
-	@Since(Version.TEIID_8_11)
 	public enum TranlatorPropertyType{IMPORT, OVERRIDE, EXTENSION_METADATA, ALL};
 
     /**
@@ -151,7 +149,6 @@ void updateSource(String vdbName, String vdbVersion, String sourceName,
      * @param content
      * @throws AdminException
      */
-    @Since(Version.TEIID_8_0)
     void deploy(String deployName, InputStream content) throws AdminException;
 
     /**
@@ -162,23 +159,20 @@ void updateSource(String vdbName, String vdbVersion, String sourceName,
      *
      * @return the {@link VDB} representing the current property values and runtime state.
      */
-    @Removed(Version.TEIID_8_0)
     void deployVDB(String fileName, InputStream vdb) throws AdminException;
 
     /**
      * Undeploy artifact (VDB, JAR, RAR files)
      * @param deployedName
      * @throws AdminException
      */
-    @Since(Version.TEIID_8_0)
     void undeploy(String deployedName) throws AdminException;
 
     /**
      * Delete a vdb
      * @param vdbName
      * @param version
      */
-    @Removed(Version.TEIID_8_0)
     void deleteVDB(String vdbName, int version);
 
     /**
@@ -307,7 +301,6 @@ void updateSource(String vdbName, String vdbVersion, String sourceName,
      * @return translator property definitions
      * @throws AdminException
      */
-    @Since(Version.TEIID_8_7)
     Collection<? extends PropertyDefinition> getTranslatorPropertyDefinitions(String translatorName, TranlatorPropertyType type) throws AdminException;
 
 

diff --git a/plugins/teiid/org.teiid.runtime.client_v9/admin/org/teiid/adminapi/DataPolicy.java b/plugins/teiid/org.teiid.runtime.client_v9/admin/org/teiid/adminapi/DataPolicy.java
@@ -23,7 +23,6 @@
 
 
 import java.util.List;
-import org.teiid.designer.annotation.Since;
 import org.teiid.designer.runtime.version.spi.TeiidServerVersion.Version;
 
 public interface DataPolicy {
@@ -33,13 +32,13 @@ public enum Context {
 		DROP,
 		QUERY,
 		INSERT,
-		@Since(Version.TEIID_8_0)
 		MERGE,
 		UPDATE,
 		DELETE,
 		FUNCTION,
 		ALTER,
-		STORED_PROCEDURE;
+		STORED_PROCEDURE,
+		METADATA;
     }
 
 	public enum PermissionType {
@@ -50,7 +49,6 @@ public enum PermissionType {
 		ALTER,
 		EXECUTE,
 		DROP,
-		@Since(Version.TEIID_8_0)
 		LANGUAGE};
 
 
@@ -88,7 +86,6 @@ public enum PermissionType {
 	 * If the policy grants all permissions
 	 * @return
 	 */
-	@Since(Version.TEIID_8_7)
 	boolean isGrantAll();
 
 	/**
@@ -144,31 +141,26 @@ interface DataPermission {
 		 * Is "LANGUAGE" allowed?
 		 * @return
 		 */
-		@Since(Version.TEIID_8_0)
 		Boolean getAllowLanguage();
 
 		/**
 		 * The condition string
 		 */
-		@Since(Version.TEIID_8_0)
 		String getCondition();
 
 		/**
 		 * The column mask string
 		 */
-		@Since(Version.TEIID_8_0)
 		String getMask();
 
 		/**
 		 * The column mask order
 		 */
-		@Since(Version.TEIID_8_0)
 		Integer getOrder();
 
 		/**
 		 * If the condition acts as a constraint.
 		 */
-		@Since(Version.TEIID_8_0)
 		Boolean getConstraint();
 
 	}

diff --git a/plugins/teiid/org.teiid.runtime.client_v9/admin/org/teiid/adminapi/Model.java b/plugins/teiid/org.teiid.runtime.client_v9/admin/org/teiid/adminapi/Model.java
@@ -23,7 +23,6 @@
 package org.teiid.adminapi;
 
 import java.util.List;
-import org.teiid.designer.annotation.Since;
 import org.teiid.designer.runtime.version.spi.TeiidServerVersion.Version;
 
 
@@ -98,14 +97,12 @@ enum MetadataStatus {LOADING, LOADED, FAILED, RETRYING};
      * Shows any validity errors present in the model
      * @return
      */
-	@Since(Version.TEIID_8_0)
     List<String> getValidityErrors();
 
     /**
      * Metadata Load status of the model.
      * @return
      */
-	@Since(Version.TEIID_8_0)
     MetadataStatus getMetadataStatus();
 
 	/**

diff --git a/plugins/teiid/org.teiid.runtime.client_v9/admin/org/teiid/adminapi/PropertyDefinition.java b/plugins/teiid/org.teiid.runtime.client_v9/admin/org/teiid/adminapi/PropertyDefinition.java
@@ -23,7 +23,6 @@
 package org.teiid.adminapi;
 
 import java.util.Collection;
-import org.teiid.designer.annotation.Since;
 import org.teiid.designer.runtime.version.spi.TeiidServerVersion.Version;
 
 /**
@@ -136,7 +135,6 @@ public enum RestartType {
      * Get the category of the property
      * @return if null, no category exists
      */
-    @Since(Version.TEIID_8_12_4)
     String getCategory();
 
 }

diff --git a/plugins/teiid/org.teiid.runtime.client_v9/admin/org/teiid/adminapi/VDB.java b/plugins/teiid/org.teiid.runtime.client_v9/admin/org/teiid/adminapi/VDB.java
@@ -24,7 +24,7 @@
 
 import java.util.List;
 import org.teiid.designer.annotation.Removed;
-import org.teiid.designer.annotation.Since;
+
 import org.teiid.designer.runtime.version.spi.TeiidServerVersion.Version;
 
 /**