chore(TDI-49841):bump TCK connector 1.27.23 for R2023-06 (#6198)

* chore(TUP-38551) json-smart:2.4.7 ( CVE-2023-1370)

* update json-smart version 2.4.10 to 2.4.9

* update maven url index for upgrade json-smart

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java

@@ -88,8 +88,8 @@ public enum EDatabaseVersion4Drivers {
             "Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
             new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.25.jar", "slf4j-log4j12-1.7.25.jar", "adal4j-1.6.7.jar", //$NON-NLS-1$
                     "commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.9.jar", "oauth2-oidc-sdk-9.7.jar",
-                    "json-smart-2.4.7.jar", "nimbus-jose-jwt-9.22.jar", "javax.mail-1.6.2.jar", "reload4j-1.2.19.jar",
-                    "accessors-smart-2.4.7.jar", "asm-9.1.jar", "content-type-2.1.jar" })),
+                    "json-smart-2.4.9.jar", "nimbus-jose-jwt-9.22.jar", "javax.mail-1.6.2.jar", "reload4j-1.2.19.jar",
+                    "accessors-smart-2.4.9.jar", "asm-9.5.jar", "content-type-2.1.jar" })),
 
     VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     VERTICA_7_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.1.X (Deprecated)", "VERTICA_7_1_X", "vertica-jdbc-7.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/ContextUtils.java

@@ -951,6 +951,14 @@ public class ContextUtils {
             params.add(param);
         }
 
+        public boolean remove(Item item, String param) {
+            Set<String> params = map.get(item);
+            if (params != null && params.contains(param)) {
+                return params.remove(param);
+            }
+            return false;
+        }
+
         @SuppressWarnings("unchecked")
         public Set<String> get(Item item) {
             Set<String> params = map.get(item);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java

@@ -79,4 +79,8 @@ public final class TalendPropertiesUtil {
     public static String getProductApp() {
         return System.getProperty(PROD_APP);
     }
+
+    public static boolean isEnabledUseShortJobletName() {
+        return isEnabled("talend.job.build.useShortJobletName"); //$NON-NLS-1$
+    }
 }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/proposal/RoutinesFunctionProposal.java

@@ -78,6 +78,7 @@ public class RoutinesFunctionProposal implements IContentProposal {
         message += Messages.getString("RoutinesFunctionProposal.CreatedBy");
         message += Messages.getString("RoutinesFunctionProposal.ReturnType");
         message += Messages.getString("RoutinesFunctionProposal.VariableName");
+        message = message.replaceAll("\n", System.getProperty("line.separator", "\n")); // for display on Windows platform
 
         MessageFormat format = new MessageFormat(message);
         Object[] args = new Object[] { function.getDescription(),

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/token/TokenInforUtil.java

@@ -134,7 +134,7 @@ public final class TokenInforUtil {
                     targetArray = new JSONArray();
                     Map<String,List<JSONObject>> objectMap = new HashMap<String,List<JSONObject>>();
                     for (Object obj : data) {
-                        if((obj instanceof JSONObject) && ((JSONObject)obj).get("component_name")!=null){//$NON-NLS-1$
+                        if((obj instanceof JSONObject) && ((JSONObject)obj).has("component_name") && ((JSONObject)obj).get("component_name")!=null){//$NON-NLS-1$
                             List<JSONObject> dataList = new ArrayList<JSONObject>();
                             String componentName = (String) ((JSONObject)obj).get("component_name");//$NON-NLS-1$
                             if(objectMap.containsKey(componentName)){

main/plugins/org.talend.designer.maven.tos/resources/components/pom.xml

@@ -42,7 +42,7 @@
 			<dependency>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
-                <version>20140107</version>
+                <version>20230227</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.dataformat</groupId>

main/plugins/org.talend.designer.maven.tos/resources/tacokit/pom.xml

@@ -10,7 +10,7 @@
 	<artifactId>studio-tacokit-dependencies</artifactId>
 	<packaging>pom</packaging>
 	<properties>
-		<tacokit.components.version>1.27.19</tacokit.components.version>
+		<tacokit.components.version>1.27.23</tacokit.components.version>
 	</properties>
 	<repositories>
 		<repository>

main/plugins/org.talend.designer.maven.tos/resources/tcompv1/pom.xml

@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <tcomp.version>1.38.8</tcomp.version>
+        <tcomp.version>1.38.9</tcomp.version>
         <slf4j.version>1.7.32</slf4j.version>
         <log4j2.version>2.17.1</log4j2.version>
         <reload4j.version>1.2.19</reload4j.version>

main/plugins/org.talend.librariesmanager/resources/java/routines/TalendDate.java

@@ -467,13 +467,13 @@ public class TalendDate {
      *
      * {Category} TalendDate
      *
-     * {param} String("") string : date represent in string
+     * {param} String("2008/11/24 12:15:25") string : date represent in string
      *
-     * {param} String("yyyy-MM-dd") pattern : date pattern
+     * {param} String("yyyy/MM/dd HH:mm:ss") pattern : date pattern
      *
-     * {param} int(addValue) nb : the added value
+     * {param} int(5) nb : the added value
      *
-     * {param} date("MM") dateType : the part to add
+     * {param} String("dd") dateType : the part to add
      *
      * {examples}
      *
@@ -1216,8 +1216,19 @@ public class TalendDate {
     }
 
     /**
-     * format date to mssql 2008 type datetimeoffset ISO 8601 string with local time zone format string : yyyy-MM-dd
-     * HH:mm:ss.SSSXXX(JDK7 support it)
+     * Format date to mssql 2008 type datetimeoffset ISO 8601 string with local time zone format string : yyyy-MM-dd
+     * HH:mm:ss.SSSXXX (JDK7 support it)
+     *
+     * @param date the time value to be formatted into a time string.
+     * @return the formatted time string.
+     *
+     * {talendTypes} String
+     *
+     * {Category} TalendDate
+     *
+     * {param} date(new Date()) date : the time value to be formatted into a time string
+     *
+     * {example} formatDatetimeoffset(new Date()) #
      */
     public static String formatDatetimeoffset(Date date) {
         String dateString = formatDate("yyyy-MM-dd HH:mm:ss.SSSZ", date);// keep the max precision in java
@@ -1346,14 +1357,28 @@ public class TalendDate {
     }
 
     /**
-     *
+     * Convert a formatted string to date
+     * 
      * @param string Must be a string datatype. Passes the values that you want to convert.
      * @param format Enter a valid TO_DATE format string. The format string must match the parts of the string argument
-     * 		  default formate is "MM/DD/yyyy HH:mm:ss.sss" if not specified.
+     * default format is "MM/DD/yyyy HH:mm:ss.sss" if not specified.
+     * 
      * @return Date
      * @throws ParseException
-     * {example} TO_DATE("1464576463231", "J") #Mon May 30 10:47:43 CST 2016
-     * {example} TO_DATE("2015-11-21 13:23:45","yyyy-MM-dd HH:mm:ss") #Sat Nov 21 13:23:45 CST 2015
+     * 
+     * {talendTypes} Date
+     *
+     * {Category} TalendDate
+     * 
+     * {param} String("2015-11-21 13:23:45") string : string Must be a string datatype. Passes the values that you want
+     * to convert.
+     *
+     * {param} String("yyyy-MM-dd HH:mm:ss") format : Enter a valid TO_DATE format string. The format string must match
+     * the parts of the string argument default format is "MM/DD/yyyy HH:mm:ss.sss" if not specified.
+     *
+     *
+     * {example} TO_DATE("1464576463231", "J") #Mon May 30 10:47:43 CST 2016 {example} TO_DATE("2015-11-21
+     * 13:23:45","yyyy-MM-dd HH:mm:ss") #Sat Nov 21 13:23:45 CST 2015
      *
      */
     public static Date TO_DATE(String string, String format) throws ParseException {
@@ -1374,6 +1399,24 @@ public class TalendDate {
 
     }
 
+    /**
+     * Convert a formatted string to date with default format as ""MM/DD/yyyy HH:mm:ss.sss"
+     * 
+     * @param string Must be a string datatype. Passes the values that you want to convert.
+     * @return Date
+     * @throws ParseException
+     * 
+     * {talendTypes} Date
+     *
+     * {Category} TalendDate
+     * 
+     * {param} String("11/21/2015 13:23:45.111") string : string Must be a string datatype. Passes the values that you
+     * want to convert.
+     *
+     * {example} TO_DATE("11/21/2015 13:23:45.111") #Sat Nov 21 13:23:45.111 CST 2015
+     *
+     */
+
     public static Date TO_DATE(String string) throws ParseException {
         return TO_DATE(string, null);
     }
@@ -1410,13 +1453,25 @@ public class TalendDate {
     }
 
     /**
-     *
-     * @param date  Passes the values you want to change
+     * Add values to the specified portion of the date
+     * 
+     * @param date Passes the values you want to change
      * @param format A format string specifying the portion of the date value you want to change.For example, 'mm'.
-     * @param amount An integer value specifying the amount of years, months, days, hours,
-     * 				and so on by which you want to change the date value.
-     * @return Date  NULL if a null value is passed as an argument to the function.
+     * @param amount An integer value specifying the amount of years, months, days, hours, and so on by which you want
+     * to change the date value.
+     * @return Date NULL if a null value is passed as an argument to the function.
      * @throws ParseException
+     * 
+     * {talendTypes} Date
+     *
+     * {Category} TalendDate
+     * 
+     * {param} Date(new Date()) date :
+     * 
+     * {param} String("HH") format :
+     * 
+     * {param} int(2) amount :
+     * 
      * {example} ADD_TO_DATE(new Date(1464576463231l), "HH",2) #Mon May 30 12:47:43 CST 2016
      */
     public static Date ADD_TO_DATE(Date date, String format, int amount) throws ParseException{
@@ -1485,10 +1540,21 @@ public class TalendDate {
     }
 
     /**
+     * Convert a Date to a formatted character string.
      *
-     * @param date  Date/Time datatype. Passes the date values you want to convert to character strings.
-     * @param format   Enter a valid TO_CHAR format string. The format string defines the format of the return value,
-     * @return  String.   NULL if a value passed to the function is NULL.
+     * @param date the date value you want to convert to character strings.
+     * @param format the format of the return value,
+     * @return String. NULL if a value passed to the function is NULL.
+     *
+     * {talendTypes} String
+     *
+     * {Category} TalendDate
+     *
+     * {param} Date(new Date()) date : the date value you want to convert to character strings.
+     * 
+     * {param} String("MM/DD/YYYY HH24:MI:SS") format : the format of the return value,
+     *
+     * {example} TO_CHAR(new Date(),"MM/DD/YYYY HH24:MI:SS") #
      */
 
     public static String TO_CHAR(Date date, String format) {

main/plugins/org.talend.metadata.managment/plugin.xml

@@ -48,9 +48,9 @@
             context="plugin:org.talend.metadata.managment"
             language="java"
             message="Needed for create snowflake connection"
-            mvn_uri="mvn:net.snowflake/snowflake-jdbc/3.11.0"
-            name="snowflake-jdbc-3.11.0.jar"
-            required="false">
+            mvn_uri="mvn:net.snowflake/snowflake-jdbc/3.13.29"
+            name="snowflake-jdbc-3.13.29.jar"
+            required="true">
       </libraryNeeded>
       <libraryNeeded
             context="plugin:org.talend.metadata.managment"
@@ -148,6 +148,33 @@
             required="true"
             uripath="platform:/plugin/org.talend.libraries.jdbc.hsql/lib/hsqldb.jar">
       </libraryNeeded>
+      <libraryNeeded
+            context="plugin:org.talend.metadata.managment"
+            language="java"
+            message="Needed for create Microsoft SQL Server db connection"
+            mvn_uri="mvn:net.minidev/json-smart/2.4.9"
+            name="json-smart-2.4.9.jar"
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.tis.custom/lib/json-smart-2.4.9.jar">
+     </libraryNeeded>
+     <libraryNeeded
+           context="plugin:org.talend.metadata.managment"
+           language="java"
+           message="Needed for create Microsoft SQL Server db connection"
+           mvn_uri="mvn:net.minidev/accessors-smart/2.4.9"
+           name="accessors-smart-2.4.9.jar"
+           required="true"
+           uripath="platform:/plugin/org.talend.libraries.tis.custom/lib/accessors-smart-2.4.9.jar">
+     </libraryNeeded>
+     <libraryNeeded
+           context="plugin:org.talend.metadata.managment"
+           language="java"
+           message="Needed for create Microsoft SQL Server db connection"
+           mvn_uri="mvn:org.ow2.asm/asm/9.5"
+           name="asm-9.5.jar"
+           required="true"
+           uripath="platform:/plugin/org.talend.libraries.tis.custom/lib/asm-9.5.jar">
+     </libraryNeeded>
    </extension>
    <extension
          point="org.talend.core.migrationTask">

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/AbstractTableBuilder.java

@@ -19,8 +19,6 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import metadata.managment.i18n.Messages;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.talend.cwm.helper.ColumnSetHelper;
@@ -29,6 +27,7 @@ import org.talend.metadata.managment.utils.MetadataConnectionUtils;
 import org.talend.utils.sql.metadata.constants.GetTable;
 import org.talend.utils.sql.metadata.constants.TableType;
 
+import metadata.managment.i18n.Messages;
 import orgomg.cwm.resource.relational.NamedColumnSet;
 
 /**
@@ -177,9 +176,9 @@ public abstract class AbstractTableBuilder<T extends NamedColumnSet> extends Cwm
         String tableComment = tablesSet.getString(GetTable.REMARKS.name());
         if (StringUtils.isBlank(tableComment)) {
             String dbProductName = getConnectionMetadata(connection).getDatabaseProductName();
-            String selectRemarkOnTable = MetadataConnectionUtils.getCommonQueryStr(dbProductName, tableName);
+            String selectRemarkOnTable = MetadataConnectionUtils.getCommonQueryStr(dbProductName);
             if (selectRemarkOnTable != null) {
-                tableComment = executeGetCommentStatement(selectRemarkOnTable);
+                tableComment = executeGetCommentStatement(selectRemarkOnTable, tableName);
             }
         }
         return tableComment;

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/CwmBuilder.java

@@ -14,14 +14,14 @@ package org.talend.core.model.metadata.builder.database;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
-
-import metadata.managment.i18n.Messages;
 
 import org.apache.log4j.Logger;
 
+import metadata.managment.i18n.Messages;
+
 /**
  * @author scorreia
  *
@@ -73,14 +73,48 @@ abstract class CwmBuilder {
      */
     protected String executeGetCommentStatement(String queryStmt) {
         String comment = null;
-        Statement statement = null;
+        PreparedStatement statement = null;
         ResultSet resultSet = null;
         try {
-            statement = connection.createStatement();
-            statement.execute(queryStmt);
+            statement = connection.prepareStatement(queryStmt);
+            resultSet = statement.executeQuery();
+
+            if (resultSet != null) {
+                while (resultSet.next()) {
+                    comment = (String) resultSet.getObject(1);
+                }
+            }
+        } catch (SQLException e) {
+            // do nothing here
+        } finally {
+            // -- release resources
+            if (resultSet != null) {
+                try {
+                    resultSet.close();
+                } catch (SQLException e) {
+                    log.error(e, e);
+                }
+            }
+            if (statement != null) {
+                try {
+                    statement.close();
+                } catch (SQLException e) {
+                    log.error(e, e);
+                }
+            }
+        }
+        return comment;
+    }
+
+    protected String executeGetCommentStatement(String queryStmt, String tableName) {
+        String comment = null;
+        PreparedStatement statement = null;
+        ResultSet resultSet = null;
+        try {
+            statement = connection.prepareStatement(queryStmt);
+            statement.setString(1, tableName);
+            resultSet = statement.executeQuery();
 
-            // get the results
-            resultSet = statement.getResultSet();
             if (resultSet != null) {
                 while (resultSet.next()) {
                     comment = (String) resultSet.getObject(1);

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/ExtractMetaDataUtils.java

@@ -126,7 +126,7 @@ public class ExtractMetaDataUtils {
 
     public static final String SNOWFLAKE = "Snowflake"; //$NON-NLS-1$
 
-    public static final String SNOWFLAKE_DRIVER_JAR = "snowflake-jdbc-3.11.0.jar"; //$NON-NLS-1$
+    public static final String SNOWFLAKE_DRIVER_JAR = "snowflake-jdbc-3.13.29.jar"; //$NON-NLS-1$
 
     private ExtractMetaDataUtils() {
     }

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/model/DBConnectionFillerImpl.java

@@ -1517,6 +1517,9 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
 
     private boolean hasRemarksColumn(ResultSet resultSet) {
         try {
+            if (resultSet == null || resultSet.getMetaData() == null) {
+                return false;
+            }
             int numOfCols = resultSet.getMetaData().getColumnCount();
             for (int i = 1; i < numOfCols + 1; i++) {
                 String colName = resultSet.getMetaData().getColumnLabel(i);

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/utils/MetadataConnectionUtils.java

@@ -805,6 +805,33 @@ public class MetadataConnectionUtils {
 
     }
 
+    public static String getCommonQueryStr(String productName) {
+        if (productName == null) {
+            return null;
+        }
+        productName = productName.replaceAll(" ", "_"); //$NON-NLS-1$ //$NON-NLS-2$
+        EDataBaseType eDataBaseType = null;
+        try {
+            eDataBaseType = EDataBaseType.valueOf(productName);
+        } catch (Exception e) {
+            eDataBaseType = EDataBaseType.Microsoft_SQL_Server;
+        }
+        String sqlStr = ""; //$NON-NLS-1$
+        switch (eDataBaseType) {
+        case Oracle:
+            sqlStr = "SELECT COMMENTS FROM USER_TAB_COMMENTS WHERE TABLE_NAME= ? "; //$NON-NLS-1$
+            break;
+        case MySQL:
+            sqlStr = "SELECT TABLE_COMMENT FROM information_schema.TABLES WHERE TABLE_NAME= ? "; //$NON-NLS-1$
+            break;
+        default:
+            sqlStr = null;
+
+        }
+        return sqlStr;
+
+    }
+
     /**
      * get Comment Query Str.
      *

main/plugins/org.talend.migrationTool/src/org/talend/migrationtool/MigrationToolService.java

@@ -23,6 +23,7 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
@@ -240,20 +241,14 @@ public class MigrationToolService implements IMigrationToolService {
         sortMigrationTasks(toExecute);
 
         final List<MigrationTask> done = new ArrayList<MigrationTask>(storedMigrations);
-        int nbMigrationsToDo = 0;
-        for (IProjectMigrationTask task : toExecute) {
-            MigrationTask mgTask = MigrationUtil.findMigrationTask(done, task);
-            if (mgTask == null && !task.isDeprecated()) {
-                nbMigrationsToDo++;
-            }
-        }
+        boolean hasTaskToExecute = toExecute.stream()
+                .anyMatch(task -> !task.isDeprecated() && MigrationUtil.findMigrationTask(done, task) == null);
 
         // force to redo the migration task for the relations only if user ask for "clean" or if relations is empty
         // or if there is at least another migration to do.
-        if (!beforeLogon
-                && (!RelationshipItemBuilder.INDEX_VERSION.equals(project.getEmfProject().getItemsRelationVersion()) || nbMigrationsToDo > 0)) {
+        if (!beforeLogon && (!RelationshipItemBuilder.INDEX_VERSION.equals(project.getEmfProject().getItemsRelationVersion())
+                || hasTaskToExecute)) {
             // force to redo this migration task, to make sure the relationship is done correctly
-            // done.remove(RELATION_TASK);
             MigrationUtil.removeMigrationTaskById(done, RELATION_TASK);
             RelationshipItemBuilder.getInstance().unloadRelations();
 
@@ -264,41 +259,37 @@ public class MigrationToolService implements IMigrationToolService {
                     RelationshipItemBuilder.JOBLET_RELATION, true);
             // reset
             RelationshipItemBuilder.getInstance().unloadRelations();
-
-            nbMigrationsToDo++;
+            hasTaskToExecute = true;
         }
-        if (nbMigrationsToDo == 0) {
+
+        boolean checkDupContext = !beforeLogon && Boolean.getBoolean("duplicate.context.reference.check");
+        if (!hasTaskToExecute && !checkDupContext) {
             return;
         }
 
-        // force execute migration in case user copy-past items with diffrent path on the file system and refresh
-        // the studio,it may cause bug TDI-19229
-        MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.FixProjectResourceLink");
-        // force to re-generate all job poms
-        MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.GenerateJobPomMigrationTask");
-
-        if (beforeLogon) {
-            // for every migration, force reset to default maven template
-            MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.ResetMavenTemplateMigrationTask");
+        if (checkDupContext) {
+            MigrationUtil.removeMigrationTaskById(done,
+                    "org.talend.repository.model.migration.RemoveDuplicateContextReferencesMigrationTask");
         }
+        if (hasTaskToExecute) {
+            // force execute migration in case user copy-past items with diffrent path on the file system and refresh
+            // the studio,it may cause bug TDI-19229
+            MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.FixProjectResourceLink");
+            // force to re-generate all job poms
+            MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.GenerateJobPomMigrationTask");
 
-        boolean haveAnyBinFolder = false; // to avoid some problems of migration, sometimes
-        for (ERepositoryObjectType type : (ERepositoryObjectType[]) ERepositoryObjectType.values()) {
-            if (!type.hasFolder()) {
-                continue;
+            if (beforeLogon) {
+                // for every migration, force reset to default maven template
+                MigrationUtil.removeMigrationTaskById(done,
+                        "org.talend.repository.model.migration.ResetMavenTemplateMigrationTask");
             }
-            String folderName = ERepositoryObjectType.getFolderName(type);
-            if (folderName == null || "".equals(folderName)) {
-                continue;
+            boolean hasBinFolder = Stream.of((ERepositoryObjectType[]) ERepositoryObjectType.values())
+                    .filter(type -> type.hasFolder()).map(ERepositoryObjectType::getFolderName).filter(StringUtils::isNotBlank)
+                    .map(folderName -> fsProject.getFolder(folderName))
+                    .anyMatch(folder -> folder.exists() && folder.getFolder("bin").exists());
+            if (hasBinFolder) {
+                MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.RemoveBinFolderMigrationTask");
             }
-            IFolder folder = fsProject.getFolder(folderName);
-            if (folder.exists() && folder.getFolder("bin").exists()) { //$NON-NLS-1$
-                haveAnyBinFolder = true;
-                break;
-            }
-        }
-        if (haveAnyBinFolder) {
-            MigrationUtil.removeMigrationTaskById(done, "org.talend.repository.model.migration.RemoveBinFolderMigrationTask");
         }
 
         final SubProgressMonitor subProgressMonitor = new SubProgressMonitor(monitorWrap, toExecute.size());

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/ui/wizards/metadata/table/database/SelectorTableForm.java

@@ -44,8 +44,6 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.ICheckStateProvider;
-import org.eclipse.jface.viewers.ITreeViewerListener;
-import org.eclipse.jface.viewers.TreeExpansionEvent;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.wizard.WizardPage;
@@ -403,6 +401,9 @@ public class SelectorTableForm extends AbstractForm {
                 } else {
                     firstExpand = true;
                 }
+                if (treeItem.isDisposed()) {
+                    return;
+                }
                 for (TreeItem item : treeItem.getItems()) {
                     if (item.getData() != null) {
                         TableNode node = (TableNode) item.getData();
@@ -507,140 +508,9 @@ public class SelectorTableForm extends AbstractForm {
                     return;
                 }
                 
-                IMetadataConnection metadataConn = tableNode.getMetadataConn();
-
-                Connection conn = null;
-                Driver driver = null;
-
-                DatabaseMetaData dbMetaData = null;
-                ExtractMetaDataUtils extractMeta = ExtractMetaDataUtils.getInstance();
-                // Added by Marvin Wang on Mar. 13, 2013 for loading hive jars dynamically, refer to TDI-25072.
-                if (EDatabaseTypeName.HIVE.getXmlName().equalsIgnoreCase(metadataConn.getDbType())) {
-                    try {
-                        dbMetaData = HiveConnectionManager.getInstance().extractDatabaseMetaData(metadataConn);
-                    } catch (Exception e) {
-                        ExceptionHandler.process(e);
-                    }
-                } else if (EDatabaseTypeName.IMPALA.getDisplayName().equalsIgnoreCase(metadataConn.getDbType())) {
-                    try {
-                        dbMetaData = ImpalaConnectionManager.getInstance().createConnection(metadataConn).getMetaData();
-                    } catch (Exception e) {
-                        ExceptionHandler.process(e);
-                    }
-                } else {
-                    List list = extractMeta.getConnectionList(metadataConn);
-                    if (list != null && !list.isEmpty()) {
-                        for (int i = 0; i < list.size(); i++) {
-                            if (list.get(i) instanceof Connection) {
-                                conn = (Connection) list.get(i);
-                            }
-                            if (list.get(i) instanceof DriverShim) {
-                                driver = (DriverShim) list.get(i);
-                            }
-                        }
-                    }
-                    dbMetaData = extractMeta.getDatabaseMetaData(conn, metadataConn.getDbType(), metadataConn.isSqlMode(), metadataConn.getDatabase());
-                }
-
-                int type = tableNode.getType();
-                orgomg.cwm.objectmodel.core.Package pack = null;
-
                 List<MetadataTable> tableList = new ArrayList<MetadataTable>();
+                retrieveAllSubNodes(tableNode, tableList);
 
-                if (type == tableNode.CATALOG) {
-                    if (tableNode.getChildren().isEmpty()) {
-                        pack = tableNode.getCatalog();
-                    }
-                } else if (type == tableNode.SCHEMA) {
-                    pack = tableNode.getSchema();
-                }
-                try {
-                    if (pack != null) {
-                        TableInfoParameters paras = tableNode.getParas();
-                        List<ETableTypes> paraType = paras.getTypes();
-                        Set<String> availableTableTypes = new HashSet<String>();
-                        for (ETableTypes tableType : paraType) {
-                            availableTableTypes.add(tableType.getName());
-                        }
-
-                        // get all tables/views depending the filter selected
-
-                        Set<String> tableNameFilter = null;
-
-                        if (!paras.isUsedName()) {
-                            tableNameFilter = new HashSet<String>();
-                            if (paras.getSqlFiter() != null && !"".equals(paras.getSqlFiter())) { //$NON-NLS-1$
-                                PreparedStatement stmt = extractMeta.getConn().prepareStatement(paras.getSqlFiter());
-                                extractMeta.setQueryStatementTimeout(stmt);
-                                ResultSet rsTables = stmt.executeQuery();
-                                while (rsTables.next()) {
-                                    String nameKey = rsTables.getString(1).trim();
-                                    tableNameFilter.add(nameKey);
-                                }
-                                rsTables.close();
-                                stmt.close();
-                            }
-                        } else {
-                            tableNameFilter = paras.getNameFilters();
-                        }
-
-                        List<MetadataTable> tempListTables = new ArrayList<MetadataTable>();
-                        MetadataFillFactory dbInstance = MetadataFillFactory.getDBInstance(metadataConn);
-                        for (String filter : tableNameFilter) {
-                            tempListTables = dbInstance.fillAll(pack, dbMetaData, metadataConn, null, filter, availableTableTypes.toArray(new String[] {}));
-                            for (MetadataTable table : tempListTables) {
-                                boolean contains = false;
-                                for (MetadataTable inListTable : tableList) {
-                                    if (inListTable.getName().equals(table.getName())) {
-                                        contains = true;
-                                        break;
-                                    }
-                                }
-                                if (!contains) {
-                                    tableList.add(table);
-                                }
-                            }
-                        }
-                        if (tableNameFilter.isEmpty()) {
-                            tempListTables = dbInstance.fillAll(pack, dbMetaData, metadataConn, null, null, availableTableTypes.toArray(new String[] {}));
-                            for (MetadataTable table : tempListTables) {
-                                boolean contains = false;
-                                for (MetadataTable inListTable : tableList) {
-                                    if (inListTable.getName().equals(table.getName())) {
-                                        contains = true;
-                                        break;
-                                    }
-                                }
-                                if (!contains) {
-                                    tableList.add(table);
-                                }
-                            }
-                        }
-                    }
-                } catch (Exception e) {
-                    ExceptionHandler.process(e);
-                } finally {
-                    String dbType = metadataConn.getDbType();
-                    // bug 22619
-                    String driverClass = metadataConn.getDriverClass();
-                    if (conn != null) {
-                        ConnectionUtils.closeConnection(conn);
-                    }
-                    // for specific db such as derby
-                    if (driver != null) {
-                        if ((driverClass != null && driverClass.equals(EDatabase4DriverClassName.JAVADB_EMBEDED.getDriverClass()))
-                                || (dbType != null && (dbType.equals(EDatabaseTypeName.JAVADB_EMBEDED.getDisplayName()) || dbType.equals(EDatabaseTypeName.JAVADB_DERBYCLIENT.getDisplayName())
-                                        || dbType.equals(EDatabaseTypeName.JAVADB_JCCJDBC.getDisplayName()) || dbType.equals(EDatabaseTypeName.HSQLDB_IN_PROGRESS.getDisplayName())))) {
-                            try {
-                                driver.connect("jdbc:derby:;shutdown=true", null); //$NON-NLS-1$
-                            } catch (SQLException e) {
-                                // exception of shutdown success. no need to catch.
-                            }
-                        }
-                    }
-                }
-
-                transferToTableNode(tableList, tableNode);
                 Display.getDefault().syncExec(() -> {
                     viewer.setInput(tableNodeList);
                     viewer.expandToLevel(tableNode, viewer.ALL_LEVELS);
@@ -649,7 +519,7 @@ public class SelectorTableForm extends AbstractForm {
             }
 
         };
-        
+
         try {
             this.parentWizardPage.getWizard().getContainer().run(true, true, runnable);
         } catch (Exception e) {
@@ -657,6 +527,168 @@ public class SelectorTableForm extends AbstractForm {
         }
     }
 
+    private void retrieveAllSubNodes(TableNode tableNode, List<MetadataTable> tableList) {
+        tableList.clear();
+        List<TableNode> child = tableNode.getChildren();
+        boolean extended = false;
+        if (!child.isEmpty()) {
+            for (TableNode node : child) {
+                if (node.getType() == TableNode.TABLE) {
+                    extended = true;
+                    break;
+                }
+            }
+        }
+        // if extended is true, means table already got,no need to get again.
+        if (extended) {
+            return;
+        }
+
+        IMetadataConnection metadataConn = tableNode.getMetadataConn();
+
+        Connection conn = null;
+        Driver driver = null;
+
+        DatabaseMetaData dbMetaData = null;
+        ExtractMetaDataUtils extractMeta = ExtractMetaDataUtils.getInstance();
+        // Added by Marvin Wang on Mar. 13, 2013 for loading hive jars dynamically, refer to TDI-25072.
+        if (EDatabaseTypeName.HIVE.getXmlName().equalsIgnoreCase(metadataConn.getDbType())) {
+            try {
+                dbMetaData = HiveConnectionManager.getInstance().extractDatabaseMetaData(metadataConn);
+            } catch (Exception e) {
+                ExceptionHandler.process(e);
+            }
+        } else if (EDatabaseTypeName.IMPALA.getDisplayName().equalsIgnoreCase(metadataConn.getDbType())) {
+            try {
+                dbMetaData = ImpalaConnectionManager.getInstance().createConnection(metadataConn).getMetaData();
+            } catch (Exception e) {
+                ExceptionHandler.process(e);
+            }
+        } else {
+            List list = extractMeta.getConnectionList(metadataConn);
+            if (list != null && !list.isEmpty()) {
+                for (int i = 0; i < list.size(); i++) {
+                    if (list.get(i) instanceof Connection) {
+                        conn = (Connection) list.get(i);
+                    }
+                    if (list.get(i) instanceof DriverShim) {
+                        driver = (DriverShim) list.get(i);
+                    }
+                }
+            }
+            dbMetaData = extractMeta.getDatabaseMetaData(conn, metadataConn.getDbType(), metadataConn.isSqlMode(),
+                    metadataConn.getDatabase());
+        }
+
+        int type = tableNode.getType();
+        orgomg.cwm.objectmodel.core.Package pack = null;
+
+        if (type == tableNode.CATALOG) {
+            if (tableNode.getChildren().isEmpty()) {
+                pack = tableNode.getCatalog();
+            } else {
+                for (TableNode n : tableNode.getChildren()) {
+                    retrieveAllSubNodes(n, tableList);
+                }
+            }
+        } else if (type == tableNode.SCHEMA) {
+            pack = tableNode.getSchema();
+        }
+        try {
+            if (pack != null) {
+                TableInfoParameters paras = tableNode.getParas();
+                List<ETableTypes> paraType = paras.getTypes();
+                Set<String> availableTableTypes = new HashSet<String>();
+                for (ETableTypes tableType : paraType) {
+                    availableTableTypes.add(tableType.getName());
+                }
+                // get all tables/views depending the filter selected
+
+                Set<String> tableNameFilter = null;
+
+                if (!paras.isUsedName()) {
+                    tableNameFilter = new HashSet<String>();
+                    if (paras.getSqlFiter() != null && !"".equals(paras.getSqlFiter())) { //$NON-NLS-1$
+                        PreparedStatement stmt = extractMeta.getConn().prepareStatement(paras.getSqlFiter());
+                        extractMeta.setQueryStatementTimeout(stmt);
+                        ResultSet rsTables = stmt.executeQuery();
+                        while (rsTables.next()) {
+                            String nameKey = rsTables.getString(1).trim();
+                            tableNameFilter.add(nameKey);
+                        }
+                        rsTables.close();
+                        stmt.close();
+                    }
+                } else {
+                    tableNameFilter = paras.getNameFilters();
+                }
+
+                List<MetadataTable> tempListTables = new ArrayList<MetadataTable>();
+                MetadataFillFactory dbInstance = MetadataFillFactory.getDBInstance(metadataConn);
+                for (String filter : tableNameFilter) {
+                    tempListTables = dbInstance.fillAll(pack, dbMetaData, metadataConn, null, filter,
+                            availableTableTypes.toArray(new String[] {}));
+                    for (MetadataTable table : tempListTables) {
+                        boolean contains = false;
+                        for (MetadataTable inListTable : tableList) {
+                            if (inListTable.getName().equals(table.getName())) {
+                                contains = true;
+                                break;
+                            }
+                        }
+                        if (!contains) {
+                            tableList.add(table);
+                        }
+                    }
+                }
+                if (tableNameFilter.isEmpty()) {
+                    tempListTables = dbInstance.fillAll(pack, dbMetaData, metadataConn, null, null,
+                            availableTableTypes.toArray(new String[] {}));
+                    for (MetadataTable table : tempListTables) {
+                        boolean contains = false;
+                        for (MetadataTable inListTable : tableList) {
+                            if (inListTable.getName().equals(table.getName())) {
+                                contains = true;
+                                break;
+                            }
+                        }
+                        if (!contains) {
+                            tableList.add(table);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        } finally {
+            String dbType = metadataConn.getDbType();
+            // bug 22619
+            String driverClass = metadataConn.getDriverClass();
+            if (conn != null) {
+                ConnectionUtils.closeConnection(conn);
+            }
+            // for specific db such as derby
+            if (driver != null) {
+                if ((driverClass != null && driverClass.equals(EDatabase4DriverClassName.JAVADB_EMBEDED.getDriverClass()))
+                        || (dbType != null && (dbType.equals(EDatabaseTypeName.JAVADB_EMBEDED.getDisplayName())
+                                || dbType.equals(EDatabaseTypeName.JAVADB_DERBYCLIENT.getDisplayName())
+                                || dbType.equals(EDatabaseTypeName.JAVADB_JCCJDBC.getDisplayName())
+                                || dbType.equals(EDatabaseTypeName.HSQLDB_IN_PROGRESS.getDisplayName())))) {
+                    try {
+                        driver.connect("jdbc:derby:;shutdown=true", null); //$NON-NLS-1$
+                    } catch (SQLException e) {
+                        // exception of shutdown success. no need to catch.
+                    }
+                }
+            }
+        }
+
+        if (!(tableNode.getType() == TableNode.CATALOG && pack == null)) {
+            transferToTableNode(tableList, tableNode);
+        }
+
+    }
+
     protected void transferToTableNode(List<MetadataTable> list, TableNode parentNode) {
         if (list != null && !list.isEmpty()) {
             for (MetadataTable table : list) {
@@ -1149,6 +1181,10 @@ public class SelectorTableForm extends AbstractForm {
                         }
                         if (canAdd) {
                             tableNodes.add(schemaNode);
+                            if (schemaNode.getValue() != null && StringUtils.isEmpty(schemaNode.getValue().trim())) {
+                                List<MetadataTable> tableList = new ArrayList<MetadataTable>();
+                                retrieveAllSubNodes(schemaNode, tableList);
+                            }
                         }
                     }
                 }

main/plugins/org.talend.repository.view.example/components/tExampleComponent/tExampleComponent_java.xml

@@ -201,8 +201,8 @@ SHOW_IF="USE_FILE_AMBIGUOUS=='true'">
 	<CODEGENERATION>
 		<IMPORTS>
 			<IMPORT NAME="Talen File Enhanced"
-				MODULE="talend_file_enhanced-1.1.jar"
-				MVN="mvn:org.talend.components.lib/talend_file_enhanced/1.1" REQUIRED="true" />
+				MODULE="talend_file_enhanced-1.3.jar"
+				MVN="mvn:org.talend.components.lib/talend_file_enhanced/1.3" REQUIRED="true" />
 			<IMPORT NAME="Talend_CSV" MODULE="talendcsv.jar"
 				MVN="mvn:org.talend.libraries/talendcsv/6.0.0"
 				REQUIRED="true" />