feat(TDQ-21471):Iterate all context variables to check prompt needed (#6475)

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/ExceptionMessageDialog.java

@@ -40,8 +40,6 @@ public class ExceptionMessageDialog extends MessageDialog {
     private String exceptionString = null;
 
     private int[] diabledButtonIndex = new int[] {};
-    
-    private boolean expandedOnOpen = false;
 
     public ExceptionMessageDialog(Shell parentShell, String dialogTitle, Image dialogTitleImage, String dialogMessage,
             int dialogImageType, String[] dialogButtonLabels, int defaultIndex, Throwable ex) {
@@ -87,8 +85,6 @@ public class ExceptionMessageDialog extends MessageDialog {
         text.setText(exceptionString);
         text.setEditable(false);
         errorComposite.setClient(text);
-        
-        errorComposite.setExpanded(expandedOnOpen);
 
         return errorComposite;
     }
@@ -154,22 +150,6 @@ public class ExceptionMessageDialog extends MessageDialog {
         this.exceptionString = exceptionString;
     }
 
-    
-    /**
-     * @return the expandedOnOpen
-     */
-    public boolean isExpandedOnOpen() {
-        return expandedOnOpen;
-    }
-
-    
-    /**
-     * @param expandedOnOpen the expandedOnOpen to set
-     */
-    public void setExpandedOnOpen(boolean expandedOnOpen) {
-        this.expandedOnOpen = expandedOnOpen;
-    }
-
     public void setDisabledButtons(int[] index) {
         this.diabledButtonIndex = index;
     }

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/EImage.java

@@ -39,7 +39,6 @@ public enum EImage implements IImage {
     EDIT_ICON("/icons/write_obj.gif"), //$NON-NLS-1$
     READ_ICON("/icons/read_obj.gif"), //$NON-NLS-1$
 
-    WRAP_ICON("/icons/wrap.png"), //$NON-NLS-1$
     QUESTION_ICON("/icons/question.gif"), //$NON-NLS-1$
     HELP_ICON("/icons/help.png"), //$NON-NLS-1$
     MOREINFO_ICON("/icons/moreInfo.png"), //$NON-NLS-1$

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/swt/tableviewer/behavior/DefaultTableLabelProvider.java

@@ -69,10 +69,6 @@ public class DefaultTableLabelProvider implements ITableLabelProvider, ITableCol
                     returnValue = defaultValue;
                 }
             } else {
-                if ("ID_COLUMN_ROW_NUM".equals(column.getId())) {
-                    int indexOf = this.tableViewerCreator.getInputList().indexOf(element);
-                    AccessorUtils.set(column, element, indexOf + 1);
-                }
                 Object value = AccessorUtils.get(element, column);
                 CellEditor cellEditor = column.getCellEditor();
                 CellEditorValueAdapter retrieverValue = column.getCellEditorValueAdapter();

main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/FatalException.java

@@ -23,19 +23,10 @@ public class FatalException extends RuntimeException {
     @SuppressWarnings("unused")//$NON-NLS-1$
     private static final long serialVersionUID = 1L;
 
-    public static final int CODE_INCOMPATIBLE_UPDATE = 10;
-
-    private int code;
-
     public FatalException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public FatalException(int code, String message) {
-        super(message);
-        this.code = code;
-    }
-
     public FatalException(String message) {
         super(message);
     }
@@ -43,9 +34,4 @@ public class FatalException extends RuntimeException {
     public FatalException(Throwable cause) {
         super(cause);
     }
-
-    public int getCode() {
-        return code;
-    }
-
 }

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/ITaCoKitService.java

@@ -15,7 +15,6 @@ package org.talend.commons.runtime.service;
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -46,10 +45,6 @@ public interface ITaCoKitService {
     boolean isNeedMigration(String componentName, Map<String, String> properties);
 
     boolean isTaCoKitType(Object repoType);
-    
-    boolean isTaCoKitRepositoryNode(Object node);
-    
-    boolean isTaCoKitConnection(Object conn);
 
     Object getDatastoreFromDataset(Object repositoryViewObject);
 
@@ -57,12 +52,6 @@ public interface ITaCoKitService {
 
     boolean isValueSelectionParameter(Object parameter);
 
-    List<Map<String, Object>> convertToTable(String value);
-    
-    List<String> getValuesFromTableParameter(Object parameter, String... keys);
-    
-    List<String> getValuesFromTableParameterValue(String value, String ...keys);
-
     public static ITaCoKitService getInstance() {
         BundleContext bc = FrameworkUtil.getBundle(ITaCoKitService.class).getBundleContext();
         Collection<ServiceReference<ITaCoKitService>> tacokitServices = Collections.emptyList();

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/xml/XMLFileUtil.java

@@ -31,9 +31,7 @@ import javax.xml.transform.stream.StreamResult;
 
 import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Document;
-import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
 
 /**
  *
@@ -52,23 +50,6 @@ public final class XMLFileUtil {
 	public static Document loadDoc(InputStream stream) throws ParserConfigurationException, SAXException, IOException {
 		try {
 			DocumentBuilder db = DOCBUILDER_FACTORY.newDocumentBuilder();
-			db.setErrorHandler(new ErrorHandler() {
-                
-                @Override
-                public void warning(SAXParseException exception) throws SAXException {
-                    throw exception;
-                }
-                
-                @Override
-                public void fatalError(SAXParseException exception) throws SAXException {
-                    throw exception;
-                }
-                
-                @Override
-                public void error(SAXParseException exception) throws SAXException {
-                    throw exception;
-                }
-            });
 			return db.parse(stream);
 		} finally {
 			try {

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/PasswordEncryptUtil.java

@@ -13,7 +13,6 @@
 package org.talend.commons.utils;
 
 import java.security.SecureRandom;
-import java.util.regex.Pattern;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
@@ -35,8 +34,6 @@ public class PasswordEncryptUtil {
 
     private static final SecureRandom SECURERANDOM = new SecureRandom();
 
-    private static final Pattern REG_ENCRYPTED_DATA = Pattern.compile("^enc\\:system\\.encryption\\.key\\.v\\d\\:\\p{Print}+");
-
     private static SecretKey getSecretKey() throws Exception {
         if (key == null) {
             byte rawKeyData[] = StudioEncryption

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java

@@ -24,7 +24,6 @@ import java.net.URI;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -32,10 +31,6 @@ import java.util.Set;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.eclipse.core.internal.net.ProxyManager;
-import org.eclipse.core.net.proxy.IProxyData;
-import org.eclipse.core.net.proxy.IProxyService;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.talend.commons.exception.CommonExceptionHandler;
@@ -47,8 +42,6 @@ import org.talend.commons.runtime.utils.io.FileCopyUtils;
  */
 public class NetworkUtil {
 
-    private static final Logger LOGGER = Logger.getLogger(NetworkUtil.class);
-
     private static final String[] windowsCommand = { "ipconfig", "/all" }; //$NON-NLS-1$ //$NON-NLS-2$
 
     private static final String[] linuxCommand = { "/sbin/ifconfig", "-a" }; //$NON-NLS-1$ //$NON-NLS-2$
@@ -79,136 +72,6 @@ public class NetworkUtil {
 
     private static final String PROP_NETWORK_STATUS = "network.status"; //$NON-NLS-1$
 
-    private static final String SYSTEM_PROXY_ENABLED = "talend.studio.proxy.enableSystemProxyByDefault";
-
-    public static void applyProxyFromSystemProperties() throws Exception {
-        if (!Boolean.valueOf(System.getProperty("talend.studio.proxy.applySystemProps", Boolean.FALSE.toString()))) {
-            return;
-        }
-        final String passwordMask = "***";
-        String httpProxyHost = System.getProperty("http.proxyHost");
-        String httpProxyPort = System.getProperty("http.proxyPort");
-        String httpUser = System.getProperty("http.proxyUser");
-        String httpPassword = System.getProperty("http.proxyPassword");
-        if (StringUtils.isNotBlank(httpPassword)) {
-            System.setProperty("http.proxyPassword", passwordMask);
-        }
-        String httpNonProxyHosts = System.getProperty("http.nonProxyHosts");
-        String httpsProxyHost = System.getProperty("https.proxyHost");
-        String httpsProxyPort = System.getProperty("https.proxyPort");
-        String httpsUser = System.getProperty("https.proxyUser");
-        String httpsPassword = System.getProperty("https.proxyPassword");
-        if (StringUtils.isNotBlank(httpsPassword)) {
-            System.setProperty("https.proxyPassword", passwordMask);
-        }
-        String httpsNonProxyHosts = System.getProperty("https.nonProxyHosts");
-        String socksProxyHost = System.getProperty("socksProxyHost");
-        String socksProxyPort = System.getProperty("socksProxyPort");
-        String socksProxyUser = System.getProperty("socksProxyUser");
-        if (socksProxyUser == null) {
-            socksProxyUser = System.getProperty("java.net.socks.username");
-        }
-        String socksProxyPassword = System.getProperty("socksProxyPassword");
-        if (StringUtils.isNotBlank(socksProxyPassword)) {
-            System.setProperty("socksProxyPassword", passwordMask);
-        }
-        if (socksProxyPassword == null) {
-            socksProxyPassword = System.getProperty("java.net.socks.password");
-        }
-        IProxyService proxyService = ProxyManager.getProxyManager();
-        boolean isHttpProxyEnabled = StringUtils.isNotBlank(httpProxyHost) && StringUtils.isNotBlank(httpProxyPort);
-        boolean isHttpsProxyEnabled = StringUtils.isNotBlank(httpsProxyHost) && StringUtils.isNotBlank(httpsProxyPort);
-        boolean isSocksProxyEnabled = StringUtils.isNotBlank(socksProxyHost) && StringUtils.isNotBlank(socksProxyPort);
-        if (!isHttpProxyEnabled && !isHttpsProxyEnabled && !isSocksProxyEnabled) {
-            proxyService
-                    .setSystemProxiesEnabled(Boolean.valueOf(System.getProperty(SYSTEM_PROXY_ENABLED, Boolean.TRUE.toString())));
-            proxyService.setProxiesEnabled(false);
-            LOGGER.info("No proxy specified, disabled.");
-        } else {
-            proxyService.setSystemProxiesEnabled(false);
-            proxyService.setProxiesEnabled(true);
-            List<IProxyData> proxies = new ArrayList<>();
-            String initedProxyTypes = "";
-            if (isHttpProxyEnabled) {
-                try {
-                    IProxyData httpProxy = proxyService.getProxyData(IProxyData.HTTP_PROXY_TYPE);
-                    httpProxy.setHost(httpProxyHost);
-                    httpProxy.setPort(Integer.valueOf(httpProxyPort));
-                    if (StringUtils.isNotBlank(httpUser)) {
-                        httpProxy.setUserid(httpUser);
-                        if (httpPassword == null) {
-                            httpPassword = "";
-                        }
-                        httpProxy.setPassword(httpPassword);
-                    }
-                    proxies.add(httpProxy);
-                    initedProxyTypes += IProxyData.HTTP_PROXY_TYPE + " ";
-                } catch (Throwable e) {
-                    LOGGER.error(e.getMessage(), e);
-                }
-            }
-            if (isHttpsProxyEnabled) {
-                try {
-                    IProxyData httpsProxy = proxyService.getProxyData(IProxyData.HTTPS_PROXY_TYPE);
-                    httpsProxy.setHost(httpsProxyHost);
-                    httpsProxy.setPort(Integer.valueOf(httpsProxyPort));
-                    if (StringUtils.isNotBlank(httpsUser)) {
-                        httpsProxy.setUserid(httpsUser);
-                        if (httpsPassword == null) {
-                            httpsPassword = "";
-                        }
-                        httpsProxy.setPassword(httpsPassword);
-                    }
-                    proxies.add(httpsProxy);
-                    initedProxyTypes += IProxyData.HTTPS_PROXY_TYPE + " ";
-                } catch (Throwable e) {
-                    LOGGER.error(e.getMessage(), e);
-                }
-            }
-            if (isSocksProxyEnabled) {
-                try {
-                    IProxyData socksProxy = proxyService.getProxyData(IProxyData.SOCKS_PROXY_TYPE);
-                    socksProxy.setHost(socksProxyHost);
-                    socksProxy.setPort(Integer.valueOf(socksProxyPort));
-                    if (StringUtils.isNotBlank(socksProxyUser)) {
-                        socksProxy.setUserid(socksProxyUser);
-                        if (socksProxyPassword == null) {
-                            socksProxyPassword = "";
-                        }
-                        socksProxy.setPassword(socksProxyPassword);
-                    }
-                    proxies.add(socksProxy);
-                    initedProxyTypes += IProxyData.SOCKS_PROXY_TYPE;
-                } catch (Throwable e) {
-                    LOGGER.error(e.getMessage(), e);
-                }
-            }
-            proxyService.setProxyData(proxies.toArray(new IProxyData[0]));
-            List<String> nonProxyHosts = new ArrayList<>();
-            if (StringUtils.isNotBlank(httpNonProxyHosts)) {
-                String[] split = httpNonProxyHosts.split("|");
-                nonProxyHosts.addAll(Arrays.asList(split));
-            }
-            if (StringUtils.isNotBlank(httpsNonProxyHosts)) {
-                String[] split = httpsNonProxyHosts.split("|");
-                nonProxyHosts.addAll(Arrays.asList(split));
-            }
-            proxyService.setNonProxiedHosts(nonProxyHosts.toArray(new String[0]));
-
-            if (passwordMask.equals(System.getProperty("http.proxyPassword"))) {
-                System.setProperty("http.proxyPassword", httpPassword);
-            }
-            if (passwordMask.equals(System.getProperty("https.proxyPassword"))) {
-                System.setProperty("https.proxyPassword", httpsPassword);
-            }
-            if (passwordMask.equals(System.getProperty("socksProxyPassword"))) {
-                System.setProperty("socksProxyPassword", socksProxyPassword);
-            }
-
-            LOGGER.info("Succeed to init proxy: " + initedProxyTypes);
-        }
-    }
-
     public static boolean isNetworkValid() {
         return isNetworkValid(DEFAULT_TIMEOUT);
     }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/commands/ExtendedTableAddCommand.java

@@ -17,7 +17,6 @@ import java.util.List;
 
 import org.eclipse.gef.commands.Command;
 import org.talend.commons.ui.runtime.i18n.Messages;
-import org.talend.commons.ui.runtime.swt.tableviewer.TableViewerCreatorNotModifiable;
 import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
 
 /**
@@ -89,11 +88,6 @@ public class ExtendedTableAddCommand extends Command implements IExtendedTableCo
         // }
 
         extendedTable.addAll(indexStartAdd, beansToAdd);
-        // when not lazy load need to do refresh to refresh the row number
-        if (!TableViewerCreatorNotModifiable.getRecommandLazyLoad()
-                && !TableViewerCreatorNotModifiable.isLazyLoadingEnabled()) {
-            extendedTable.getTableViewer().refresh();
-        }
 
     }
 

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/commands/ExtendedTableCaseCommand.java

@@ -52,7 +52,7 @@ public abstract class ExtendedTableCaseCommand extends Command implements IExten
     @Override
     public void execute() {
         convertCase(extendedTable, beansToCovertCase, selectionIndices, isUpperCase);
-        extendedTable.getTableViewer().refresh();
+        
     }
     
     public abstract void convertCase(ExtendedTableModel extendedTable, List copiedObjectsList, int[] selectionIndices, boolean isUpperCase);

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/commands/ExtendedTablePasteCommand.java

@@ -17,7 +17,6 @@ import java.util.List;
 
 import org.eclipse.gef.commands.Command;
 import org.talend.commons.ui.runtime.i18n.Messages;
-import org.talend.commons.ui.runtime.swt.tableviewer.TableViewerCreatorNotModifiable;
 import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
 import org.talend.commons.ui.utils.SimpleClipboard;
 import org.talend.commons.utils.data.list.UniqueStringGenerator;
@@ -66,11 +65,6 @@ public abstract class ExtendedTablePasteCommand extends Command implements IExte
             List list = new ArrayList((List) data);
             list = createPastableBeansList(extendedTable, list);
             extendedTable.addAll(indexStart, list);
-            // when not lazy load need to do refresh to refresh the row number
-            if (!TableViewerCreatorNotModifiable.getRecommandLazyLoad()
-                    && !TableViewerCreatorNotModifiable.isLazyLoadingEnabled()) {
-                extendedTable.getTableViewer().refresh();
-            }
         }
 
     }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/commands/ExtendedTableQuoteCommand.java

@@ -14,7 +14,6 @@ package org.talend.commons.ui.swt.advanced.dataeditor.commands;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.eclipse.gef.commands.Command;
 import org.talend.commons.ui.runtime.i18n.Messages;
 import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
@@ -55,7 +54,7 @@ public abstract class ExtendedTableQuoteCommand extends Command implements IExte
     @Override
     public void execute() {
         toQuote(extendedTable, beansToQuote, selectionIndices, quote, isAddingQuote);
-        extendedTable.getTableViewer().refresh();
+        
     }
     
     public abstract void toQuote(ExtendedTableModel extendedTable, List copiedObjectsList, int[] selectionIndices, String quote, boolean isAddingQuote);

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/commands/ExtendedTableRemoveCommand.java

@@ -20,7 +20,6 @@ import java.util.List;
 import org.apache.commons.lang.ArrayUtils;
 import org.eclipse.gef.commands.Command;
 import org.talend.commons.ui.runtime.i18n.Messages;
-import org.talend.commons.ui.runtime.swt.tableviewer.TableViewerCreatorNotModifiable;
 import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
 
 /**
@@ -131,11 +130,6 @@ public class ExtendedTableRemoveCommand extends Command implements IExtendedTabl
                 removedBeansIndices.add(index);
             }
         }
-        // when not lazy load need to do refresh to refresh the row number
-        if (!TableViewerCreatorNotModifiable.getRecommandLazyLoad()
-                && !TableViewerCreatorNotModifiable.isLazyLoadingEnabled()) {
-            extendedTable.getTableViewer().refresh();
-        }
 
     }
 

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/utils/loader/MyURLClassLoader.java

@@ -1,178 +1,178 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.commons.ui.utils.loader;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.apache.log4j.Logger;
-import org.talend.commons.ui.runtime.exception.ExceptionHandler;
-
-/**
- * ggu class global comment. Detailled comment
- */
-public class MyURLClassLoader extends URLClassLoader {
-
-    public static interface IAssignableClassFilter {
-
-        public boolean filter(URL[] urls);
-
-        public boolean filter(Class clazz);
-
-        public boolean filter(String clazzName);
-    }
-
-    private static Logger log = Logger.getLogger(MyURLClassLoader.class);
-
-    private Map pclasses = new HashMap();
-
-    public MyURLClassLoader(String fileName) throws IOException {
-        this(new File(fileName).toURI().toURL());
-    }
-
-    public MyURLClassLoader(URL url) {
-        this(new URL[] { url });
-    }
-
-    public MyURLClassLoader(URL[] urls) {
-        super(urls, Class.class.getClassLoader());
-    }
-
-    public MyURLClassLoader(URL[] urls, ClassLoader parentLoader) {
-        super(urls, parentLoader);
-    }
-
-    public Class[] getAssignableClasses(Class type) throws IOException {
-        return getAssignableClasses(type, null);
-    }
-
-    @SuppressWarnings("unchecked")
-    public Class[] getAssignableClasses(Class type, IAssignableClassFilter filter) throws IOException {
-        List classes = new ArrayList();
-        URL[] urls = getURLs();
-        for (URL url : urls) {
-            if (filter != null && filter.filter(new URL[] { url })) {
-                continue;
-            }
-            File file = new File(url.getFile());
-            if (!file.isDirectory() && file.exists() && file.canRead()) {
-                ZipFile zipFile = null;
-                try {
-                    zipFile = new ZipFile(file);
-                } catch (IOException ex) {
-                    ExceptionHandler.process(ex);
-                }
-                Enumeration<? extends ZipEntry> entries = zipFile.entries();
-                while (entries.hasMoreElements()) {
-                    Class cls = null;
-                    String entryName = entries.nextElement().getName();
-                    String className = changeFileNameToClassName(entryName);
-                    if (className != null) {
-                        if (filter != null && filter.filter(className)) {
-                            continue;
-                        }
-                        try {
-                            cls = loadClass(className);
-                        } catch (Throwable th) {
-                            log.warn(th);
-                        }
-                        if (cls != null) {
-                            if (filter != null && filter.filter(cls)) {
-                                continue;
-                            }
-                            if (isAssignableType(type, cls)) {
-                                classes.add(cls);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return (Class[]) classes.toArray(new Class[classes.size()]);
-    }
-
-    @SuppressWarnings("unchecked")
-    private boolean isAssignableType(Class type, Class current) {
-        if (type == null || current == null || current.equals(Object.class)) {
-            return false;
-        }
-
-        if (type.isAssignableFrom(current)) {
-            return true;
-        } else
-        // sometimes can not assign the java generic, use the class url
-        if (type.getName() != null && type.getName().equals(current.getName())) {
-            return true;
-        } else {
-            //
-            if (type.isInterface()) {//
-                for (Class interfaceClazz : current.getInterfaces()) {
-                    if (interfaceClazz.equals(type)) {
-                        return true;
-                    } else {
-                        if (isAssignableType(type, interfaceClazz)) {
-                            return true;
-                        }
-                    }
-                }
-                if (isAssignableType(type, current.getSuperclass())) {
-                    return true;
-                }
-            } else {
-                return isAssignableType(type, current.getSuperclass());
-            }
-        }
-        return false;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.net.URLClassLoader#findClass(java.lang.String)
-     */
-    @SuppressWarnings("unchecked")
-    protected synchronized Class findCslass(String className) throws ClassNotFoundException {
-        Class cls = (Class) pclasses.get(className);
-        if (cls == null) {
-            cls = super.findClass(className);
-            pclasses.put(className, cls);
-        }
-        return cls;
-    }
-
-    public static String changeFileNameToClassName(String name) {
-        if (name == null) {
-            throw new IllegalArgumentException("File Name == null");
-        }
-        String className = null;
-        if (name.toLowerCase().endsWith(".class")) {
-            className = name.replace('/', '.');
-            className = className.replace('\\', '.');
-            className = className.substring(0, className.length() - 6);
-        }
-        return className;
-    }
-
-    protected void classHasBeenLoaded(Class cls) {
-    }
-
-}
+// ============================================================================
+//
+// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.ui.utils.loader;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.apache.log4j.Logger;
+import org.talend.commons.ui.runtime.exception.ExceptionHandler;
+
+/**
+ * ggu class global comment. Detailled comment
+ */
+public class MyURLClassLoader extends URLClassLoader {
+
+    public static interface IAssignableClassFilter {
+
+        public boolean filter(URL[] urls);
+
+        public boolean filter(Class clazz);
+
+        public boolean filter(String clazzName);
+    }
+
+    private static Logger log = Logger.getLogger(MyURLClassLoader.class);
+
+    private Map pclasses = new HashMap();
+
+    public MyURLClassLoader(String fileName) throws IOException {
+        this(new File(fileName).toURL());
+    }
+
+    public MyURLClassLoader(URL url) {
+        this(new URL[] { url });
+    }
+
+    public MyURLClassLoader(URL[] urls) {
+        super(urls, Class.class.getClassLoader());
+    }
+
+    public MyURLClassLoader(URL[] urls, ClassLoader parentLoader) {
+        super(urls, parentLoader);
+    }
+
+    public Class[] getAssignableClasses(Class type) throws IOException {
+        return getAssignableClasses(type, null);
+    }
+
+    @SuppressWarnings("unchecked")
+    public Class[] getAssignableClasses(Class type, IAssignableClassFilter filter) throws IOException {
+        List classes = new ArrayList();
+        URL[] urls = getURLs();
+        for (URL url : urls) {
+            if (filter != null && filter.filter(new URL[] { url })) {
+                continue;
+            }
+            File file = new File(url.getFile());
+            if (!file.isDirectory() && file.exists() && file.canRead()) {
+                ZipFile zipFile = null;
+                try {
+                    zipFile = new ZipFile(file);
+                } catch (IOException ex) {
+                    ExceptionHandler.process(ex);
+                }
+                Enumeration<? extends ZipEntry> entries = zipFile.entries();
+                while (entries.hasMoreElements()) {
+                    Class cls = null;
+                    String entryName = entries.nextElement().getName();
+                    String className = changeFileNameToClassName(entryName);
+                    if (className != null) {
+                        if (filter != null && filter.filter(className)) {
+                            continue;
+                        }
+                        try {
+                            cls = loadClass(className);
+                        } catch (Throwable th) {
+                            log.warn(th);
+                        }
+                        if (cls != null) {
+                            if (filter != null && filter.filter(cls)) {
+                                continue;
+                            }
+                            if (isAssignableType(type, cls)) {
+                                classes.add(cls);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return (Class[]) classes.toArray(new Class[classes.size()]);
+    }
+
+    @SuppressWarnings("unchecked")
+    private boolean isAssignableType(Class type, Class current) {
+        if (type == null || current == null || current.equals(Object.class)) {
+            return false;
+        }
+
+        if (type.isAssignableFrom(current)) {
+            return true;
+        } else
+        // sometimes can not assign the java generic, use the class url
+        if (type.getName() != null && type.getName().equals(current.getName())) {
+            return true;
+        } else {
+            //
+            if (type.isInterface()) {//
+                for (Class interfaceClazz : current.getInterfaces()) {
+                    if (interfaceClazz.equals(type)) {
+                        return true;
+                    } else {
+                        if (isAssignableType(type, interfaceClazz)) {
+                            return true;
+                        }
+                    }
+                }
+                if (isAssignableType(type, current.getSuperclass())) {
+                    return true;
+                }
+            } else {
+                return isAssignableType(type, current.getSuperclass());
+            }
+        }
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see java.net.URLClassLoader#findClass(java.lang.String)
+     */
+    @SuppressWarnings("unchecked")
+    protected synchronized Class findCslass(String className) throws ClassNotFoundException {
+        Class cls = (Class) pclasses.get(className);
+        if (cls == null) {
+            cls = super.findClass(className);
+            pclasses.put(className, cls);
+        }
+        return cls;
+    }
+
+    public static String changeFileNameToClassName(String name) {
+        if (name == null) {
+            throw new IllegalArgumentException("File Name == null");
+        }
+        String className = null;
+        if (name.toLowerCase().endsWith(".class")) {
+            className = name.replace('/', '.');
+            className = className.replace('\\', '.');
+            className = className.substring(0, className.length() - 6);
+        }
+        return className;
+    }
+
+    protected void classHasBeenLoaded(Class cls) {
+    }
+
+}

main/plugins/org.talend.core.repository/plugin.xml

@@ -187,10 +187,10 @@
        <RepositoryComponent
              name="GENERAL_JDBC"
              withSchema="true"
-             input="JDBCInput"
-             output="JDBCOutput">
+             input="tJDBCInput"
+             output="tJDBCOutput">
           <Item
-                clazz="org.talend.core.model.properties.TacokitDatabaseConnectionItem">
+                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
           </Item>
           <DBType
                 type="GENERAL_JDBC">
@@ -420,7 +420,18 @@
                 type="ORACLESN">
           </DBType>
        </RepositoryComponent>
-
+       <RepositoryComponent
+             name="PLUSPSQL"
+             withSchema="true"
+             input="tPostgresPlusInput"
+             output="tPostgresPlusOutput">
+          <Item
+                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
+          </Item>
+          <DBType
+                type="PLUSPSQL">
+          </DBType>
+       </RepositoryComponent>
        <RepositoryComponent
              name="PSQL"
              withSchema="true"

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages.properties

@@ -155,6 +155,7 @@ ProjectRepositoryNode.invalidItem=Invalid item
 ProjectRepositoryNode.columns=Columns
 ProjectRepositoryNode.validationRules=Validation Rules
 ProjectRepositoryNode.cdcFoundation=CDC Foundation
+ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (deprecated)
 ProjectRepositoryNode.genericSchema=Generic schemas
 ProjectRepositoryNode.queries=Queries
 ProjectRepositoryNode.synonymSchemas=Synonym schemas

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_ja.properties

@@ -155,6 +155,7 @@ ProjectRepositoryNode.invalidItem=\u7121\u52B9\u306A\u30A2\u30A4\u30C6\u30E0
 ProjectRepositoryNode.columns=\u30AB\u30E9\u30E0
 ProjectRepositoryNode.validationRules=\u691C\u8A3C\u30EB\u30FC\u30EB
 ProjectRepositoryNode.cdcFoundation=CDC Foundation
+ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (\u975E\u63A8\u5968)
 ProjectRepositoryNode.genericSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE
 ProjectRepositoryNode.queries=\u30AF\u30A8\u30EA\u30FC
 ProjectRepositoryNode.synonymSchemas=\u30B7\u30CE\u30CB\u30E0\u30B9\u30AD\u30FC\u30DE

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProjectRepositoryNode.java

@@ -35,7 +35,6 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
-import org.talend.commons.runtime.service.ITaCoKitService;
 import org.talend.commons.ui.runtime.exception.RuntimeExceptionHandler;
 import org.talend.commons.ui.runtime.image.ECoreImage;
 import org.talend.commons.ui.runtime.repository.IExtendRepositoryNode;
@@ -93,11 +92,9 @@ import org.talend.core.repository.model.repositoryObject.SAPIDocRepositoryObject
 import org.talend.core.repository.model.repositoryObject.SalesforceModuleRepositoryObject;
 import org.talend.core.repository.recyclebin.RecycleBinManager;
 import org.talend.core.repository.ui.utils.ProjectRepositoryNodeCache;
-import org.talend.core.repository.utils.RepositoryNodeManager;
 import org.talend.core.runtime.services.IGenericDBService;
 import org.talend.core.runtime.services.IGenericService;
 import org.talend.core.runtime.services.IGenericWizardService;
-import org.talend.core.service.ITCKUIService;
 import org.talend.core.ui.ICDCProviderService;
 import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.core.ui.branding.IBrandingService;
@@ -649,9 +646,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                     }
                 }
             }
-            if (RepositoryNodeManager.isSnowflake(currentType)) {
-                continue;
-            }
+
             if (currentType != null) {
                 buildFolders(rootNode, currentType, folderPath, rootNode);
             }
@@ -824,8 +819,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
      * @return
      */
     private RepositoryNode getFolder(ERepositoryObjectType currentType, String path, List<IRepositoryNode> rootNodes) {
-        if (RepositoryNodeUtilities.isGenericDBExtraType(currentType) || RepositoryNodeManager.isSnowflake(currentType)
-                || (ITaCoKitService.getInstance() != null && ITaCoKitService.getInstance().isTaCoKitType(currentType))) {
+        if (RepositoryNodeUtilities.isGenericDBExtraType(currentType)) {
             currentType = ERepositoryObjectType.METADATA_CONNECTIONS;
         }
         if (path == null || path.isEmpty()) {
@@ -1336,7 +1330,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     }
 
-    public void addNode(RepositoryNode parent, ERepositoryObjectType type, IRepositoryViewObject repositoryObject,
+    private void addNode(RepositoryNode parent, ERepositoryObjectType type, IRepositoryViewObject repositoryObject,
             List<IRepositoryViewObject> validationRules) {
 
         boolean isAvaliableInTOS = true; // this flag filter the databaseconnections which didn't supported by TOS but
@@ -1346,15 +1340,11 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             Connection conn = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
             if(conn instanceof DatabaseConnection){
                 dbMetadataConnection = (DatabaseConnection) conn;
-                if (ERepositoryObjectType.JDBC == repositoryObject.getRepositoryObjectType()
-                        && ERepositoryObjectType.JDBC.getType().equals(dbMetadataConnection.getProductId())) {
-                    // hide tcompv0 jdbc node
-                    // remove the 2nd condition if later we need to migrate Delta Lake and SingleStore
-                    return;
-                }
-                isAvaliableInTOS = EDatabaseTypeName.getTypeFromDbType(dbMetadataConnection.getDatabaseType(), false) != null;
+                isAvaliableInTOS = EDatabaseTypeName.getTypeFromDbType(dbMetadataConnection.getDatabaseType(), false) == null ? false
+                        : true;
             }
         }
+
         Connection connection = null;
         if (type == ERepositoryObjectType.METADATA_CONNECTIONS && isAvaliableInTOS) {
             connection = dbMetadataConnection;
@@ -1420,32 +1410,22 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                     }
                 }
             }
-            if (isAvaliableInTOS && node != null) {
+            if (isAvaliableInTOS) {
                 parent.getChildren().add(node);
             }
         }
 
-        if (null != connection && node != null) {
+        if (null != connection) {
             createTables(node, repositoryObject, connection, validationRules);
         }
 
-        if (node != null) {
-            for (IRepositoryContentHandler handler : RepositoryContentManager.getHandlers()) {
-                handler.addNode(type, recBinNode, repositoryObject, node);
-            }
+        for (IRepositoryContentHandler handler : RepositoryContentManager.getHandlers()) {
+            handler.addNode(type, recBinNode, repositoryObject, node);
         }
     }
 
     private RepositoryNode createRepositoryNode(RepositoryNode parent, ERepositoryObjectType repObjType,
             IRepositoryViewObject repositoryObject, Connection connection) {
-        if (ERepositoryObjectType.METADATA_TACOKIT_JDBC.equals(repositoryObject.getRepositoryObjectType()) && ITCKUIService.get() != null) {
-            try {
-                return ITCKUIService.get().createTaCoKitRepositoryNode(parent, repObjType, repositoryObject, connection);
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
-                return null;
-            }
-        }
         RepositoryNode node = new RepositoryNode(repositoryObject, parent, ENodeType.REPOSITORY_ELEMENT);
 
         node.setProperties(EProperties.CONTENT_TYPE, repObjType);
@@ -1612,7 +1592,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         return objs;
     }
 
-    public void createTables(RepositoryNode node, final IRepositoryViewObject repObj, Connection metadataConnection,
+    private void createTables(RepositoryNode node, final IRepositoryViewObject repObj, Connection metadataConnection,
             List<IRepositoryViewObject> validationRules) {
 
         // // 5.GENERIC SCHEMAS
@@ -1723,11 +1703,11 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                 DatabaseConnectionItem connectionItem = (DatabaseConnectionItem) item;
                 DatabaseConnection connection = (DatabaseConnection) connectionItem.getConnection();
                 if (PluginChecker.isCDCPluginLoaded()) {
-                    ICDCProviderService service = GlobalServiceRegister.getDefault()
-                            .getService(ICDCProviderService.class);
+                    ICDCProviderService service = GlobalServiceRegister.getDefault().getService(ICDCProviderService.class);
+
                     if (service != null && service.canCreateCDCConnection(connection)) {
                         RepositoryNode cdcNode = new StableRepositoryNode(node,
-                                Messages.getString("ProjectRepositoryNode.cdcFoundation"), //$NON-NLS-1$
+                                Messages.getString("ProjectRepositoryNode.cdcFoundation.deprecated"), //$NON-NLS-1$
                                 ECoreImage.FOLDER_CLOSE_ICON);
                         node.getChildren().add(cdcNode);
                         service.createCDCTypes(recBinNode, cdcNode, connection.getCdcConns());

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ldap/LDAPCATruster.java

@@ -147,11 +147,7 @@ public class LDAPCATruster implements X509TrustManager {
             } catch (IOException ex) {
             }
         try {
-            if (in != null) {
-                ks.load(in, certStorePwd);
-            } else {
-                ks = null;
-            }
+            ks.load(in, certStorePwd);
         } catch (Exception e) {
             log.error(Messages.getString("LDAPCATruster.failedLoadCert") + e.getMessage()); //$NON-NLS-1$
             return;

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/DeleteAction.java

@@ -21,9 +21,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.collections.map.MultiKeyMap;
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -81,7 +79,6 @@ import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.properties.ProjectReference;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.ERepositoryObjectType;
-import org.talend.core.model.repository.Folder;
 import org.talend.core.model.repository.IRepositoryContentHandler;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.ISubRepositoryObject;
@@ -100,7 +97,6 @@ import org.talend.core.repository.ui.dialog.ContextReferenceDialog;
 import org.talend.core.repository.ui.dialog.ItemReferenceDialog;
 import org.talend.core.repository.utils.AbstractResourceChangesService;
 import org.talend.core.repository.utils.RepositoryNodeDeleteManager;
-import org.talend.core.repository.utils.RepositoryNodeManager;
 import org.talend.core.repository.utils.RepositoryReferenceBeanUtils;
 import org.talend.core.repository.utils.TDQServiceRegister;
 import org.talend.core.runtime.CoreRuntimePlugin;
@@ -342,25 +338,6 @@ public class DeleteAction extends AContextualAction {
                             deletedFolder.add(node);
                             List<IRepositoryViewObject> deleteObjectList = new ArrayList<IRepositoryViewObject>();
                             deleteFolder(node, factory, deleteActionCache, deleteObjectList);
-                            if (ERepositoryObjectType.SNOWFLAKE != null) {
-                                IPath sfPath = RepositoryNodeUtilities.getPath(node);
-                                String fullPath = ERepositoryObjectType.SNOWFLAKE.getFolder() + IPath.SEPARATOR
-                                        + sfPath.toString();
-                                IProject rsProject = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject());
-                                IFolder sfFolder = ResourceUtils.getFolder(rsProject, fullPath, false);
-                                if (sfFolder.exists()) {
-                                    RepositoryNode sfRootNode = ProjectRepositoryNode.getInstance()
-                                            .getRootRepositoryNode(ERepositoryObjectType.SNOWFLAKE);
-                                    FolderItem item = factory.getFolderItem(ProjectManager.getInstance().getCurrentProject(),
-                                            ERepositoryObjectType.SNOWFLAKE, sfPath);
-                                    Folder folder = new Folder(item.getProperty(), ERepositoryObjectType.SNOWFLAKE);
-                                    RepositoryNode sfFolderNode = new RepositoryNode(folder, sfRootNode,
-                                            ENodeType.REPOSITORY_ELEMENT);
-                                    sfFolderNode.setProperties(EProperties.LABEL, folder.getLabel());
-                                    sfFolderNode.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.SNOWFLAKE);
-                                    deleteFolder(sfFolderNode, factory, deleteActionCache, deleteObjectList);
-                                }
-                            }
                         }
                     } catch (PersistenceException e) {
                         MessageBoxExceptionHandler.process(e);
@@ -500,13 +477,6 @@ public class DeleteAction extends AContextualAction {
         }
         IPath path = RepositoryNodeUtilities.getPath(node);
         ERepositoryObjectType objectType = (ERepositoryObjectType) node.getProperties(EProperties.CONTENT_TYPE);
-        if (RepositoryNodeManager.isSnowflake(objectType)) {
-            String pathStr = node.getObject().getLabel();
-            if (StringUtils.isNotBlank(node.getObject().getPath())) {
-                pathStr = node.getObject().getPath() + IPath.SEPARATOR + pathStr;
-            }
-            path = new Path(pathStr);
-        }
         List<IRepositoryNode> repositoryList = node.getChildren();
         boolean success = true;
         Exception bex = null;

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/MoveObjectAction.java

@@ -18,8 +18,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.ui.PlatformUI;
@@ -32,15 +30,12 @@ import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.RepositoryManager;
 import org.talend.core.repository.i18n.Messages;
 import org.talend.core.repository.model.JobletReferenceBean;
-import org.talend.core.repository.model.ProjectRepositoryNode;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.repository.model.repositoryObject.MetadataTableRepositoryObject;
 import org.talend.core.repository.ui.actions.metadata.CopyToGenericSchemaHelper;
 import org.talend.core.repository.ui.dialog.JobletReferenceDialog;
 import org.talend.core.repository.utils.AbstractResourceChangesService;
-import org.talend.core.repository.utils.RepositoryNodeManager;
 import org.talend.core.repository.utils.TDQServiceRegister;
-import org.talend.repository.ProjectManager;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.IRepositoryNode;
 import org.talend.repository.model.IRepositoryNode.ENodeType;
@@ -160,11 +155,8 @@ public class MoveObjectAction {
             switch (targetNode.getType()) {
             case SYSTEM_FOLDER:
             case SIMPLE_FOLDER:
-                ERepositoryObjectType sourceType = (ERepositoryObjectType) sourceNode.getProperties(EProperties.CONTENT_TYPE);
-                ERepositoryObjectType targetType = (ERepositoryObjectType) targetNode.getProperties(EProperties.CONTENT_TYPE);
-                boolean booleanValue = sourceType == targetType || (ERepositoryObjectType.METADATA_CONNECTIONS == targetType
-                        && (ERepositoryObjectType.METADATA_TACOKIT_JDBC == sourceType
-                                || RepositoryNodeManager.isSnowflake(sourceType)));
+                boolean booleanValue = ((ERepositoryObjectType) targetNode.getProperties(EProperties.CONTENT_TYPE))
+                        .equals(sourceNode.getProperties(EProperties.CONTENT_TYPE));
                 if (isGenericSchema) {
                     return true;
                 } else {
@@ -282,9 +274,7 @@ public class MoveObjectAction {
             targetPath = (targetNode == null ? new Path("") : RepositoryNodeUtilities.getPath(targetNode)); //$NON-NLS-1$
         }
         List<IRepositoryViewObject> objectToMoves = new ArrayList<IRepositoryViewObject>();
-        List<IRepositoryViewObject> snowflakeToMove = new ArrayList<>();
         Map<IRepositoryViewObject, IPath> map = new HashMap<IRepositoryViewObject, IPath>();
-        Map<IRepositoryViewObject, IPath> snowflakeMap = new HashMap<>();
         IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
         for (RepositoryNode sourceNode : nodeList) {
             IPath sourcePath = RepositoryNodeUtilities.getPath(sourceNode);
@@ -308,18 +298,6 @@ public class MoveObjectAction {
                         // Move :
                         if (isGenericSchema) {
                             CopyToGenericSchemaHelper.copyToGenericSchema(factory, objectToMove, targetPath);
-                        } else if (RepositoryNodeManager.isSnowflake(sourceNode.getObjectType())
-                                && ERepositoryObjectType.METADATA_CONNECTIONS == targetNode.getContentType()
-                                && (ENodeType.SYSTEM_FOLDER == targetNode.getType()
-                                        || ENodeType.SIMPLE_FOLDER == targetNode.getType())) {
-                            if (!ProjectRepositoryNode.class.isInstance(targetNode.getParent())
-                                    && targetNode.getObject() != null) {
-                                factory.createFolder(ERepositoryObjectType.SNOWFLAKE,
-                                        RepositoryNodeUtilities.getPath(targetNode.getParent()),
-                                        targetNode.getObject().getProperty().getLabel());
-                            }
-                            snowflakeToMove.add(objectToMove);
-                            snowflakeMap.put(objectToMove, sourcePath);
                         } else {
                             // MOD gdbu 2011-9-29 TDQ-3546
                             ERepositoryObjectType repositoryObjectType = objectToMove.getRepositoryObjectType();
@@ -347,18 +325,6 @@ public class MoveObjectAction {
                 // Source is a folder :
                 ERepositoryObjectType sourceType = (ERepositoryObjectType) sourceNode.getProperties(EProperties.CONTENT_TYPE);
                 factory.moveFolder(sourceType, sourcePath, targetPath);
-
-                if (ERepositoryObjectType.SNOWFLAKE != null) {
-                    String snowflakePath = ERepositoryObjectType.getFolderName(ERepositoryObjectType.SNOWFLAKE);
-                    if (!sourcePath.isEmpty()) {
-                        snowflakePath += IPath.SEPARATOR + sourcePath.toString();
-                    }
-                    IProject project = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject());
-                    IFolder folder = ResourceUtils.getFolder(project, snowflakePath, false);
-                    if (folder.exists() && folder.members().length > 0) {
-                        factory.moveFolder(ERepositoryObjectType.SNOWFLAKE, sourcePath, targetPath);
-                    }
-                }
             }
         }
         if (objectToMoves.size() > 0) {
@@ -369,10 +335,6 @@ public class MoveObjectAction {
             }
             factory.moveObjectMulti(objectArray, targetPath, map);
         }
-        if (!snowflakeToMove.isEmpty()) {
-            factory.moveObjectMulti(snowflakeToMove.toArray(new IRepositoryViewObject[] {}),
-                    RepositoryNodeUtilities.getPath(targetNode), snowflakeMap);
-        }
     }
 
     public void execute(RepositoryNode sourceNode, RepositoryNode targetNode, boolean isDnd) throws Exception {

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/RestoreAction.java

@@ -18,8 +18,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -39,7 +37,6 @@ import org.talend.commons.runtime.model.repository.ERepositoryStatus;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.runtime.image.EImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
-import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ITDQRepositoryService;
 import org.talend.core.model.metadata.builder.connection.AbstractMetadataObject;
@@ -52,7 +49,6 @@ import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.ISubRepositoryObject;
 import org.talend.core.repository.i18n.Messages;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
-import org.talend.core.repository.utils.RepositoryNodeManager;
 import org.talend.core.service.ICoreUIService;
 import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.repository.ProjectManager;
@@ -115,42 +111,9 @@ public class RestoreAction extends AContextualAction {
                 Item item = node.getObject().getProperty().getItem();
                 if (item instanceof FolderItem) {
                     item.getState().setDeleted(false);
-                    if (nodeType == ERepositoryObjectType.METADATA_CONNECTIONS && ERepositoryObjectType.SNOWFLAKE != null) {
-                        IPath sfPath = new Path(node.getObject().getPath()).append(node.getObject().getLabel());
-                        String fullPath = ERepositoryObjectType.SNOWFLAKE.getFolder() + IPath.SEPARATOR + sfPath;
-                        IProject rsProject = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject());
-                        IFolder sfFolder = ResourceUtils.getFolder(rsProject, fullPath, false);
-                        if (sfFolder.exists()) {
-                            FolderItem sfItem = ProxyRepositoryFactory.getInstance().getFolderItem(ProjectManager.getInstance().getCurrentProject(),
-                                    ERepositoryObjectType.SNOWFLAKE, sfPath);
-                            sfItem.getState().setDeleted(false);
-                            while (sfPath.segmentCount() > 1) {
-                                sfPath = sfPath.removeLastSegments(1);
-                                FolderItem parentItem = ProxyRepositoryFactory.getInstance().getFolderItem(
-                                        ProjectManager.getInstance().getCurrentProject(), ERepositoryObjectType.SNOWFLAKE,
-                                        sfPath);
-                                if (ProxyRepositoryFactory.getInstance().getStatus(parentItem) == ERepositoryStatus.DELETED) {
-                                    parentItem.getState().setDeleted(false);
-                                }
-                            }
-                        }
-                    }
                 } else {
                     RestoreObjectAction restoreObjectAction = RestoreObjectAction.getInstance();
                     restoreObjectAction.execute(node, null, path);
-
-                    if (RepositoryNodeManager.isSnowflake(nodeType)) {
-                        IPath sfPath = new Path(node.getObject().getPath()).append(node.getObject().getLabel());
-                        while (sfPath.segmentCount() > 1) {
-                            sfPath = sfPath.removeLastSegments(1);
-                            FolderItem parentItem = ProxyRepositoryFactory.getInstance().getFolderItem(
-                                    ProjectManager.getInstance().getCurrentProject(), ERepositoryObjectType.SNOWFLAKE, sfPath);
-                            if (ProxyRepositoryFactory.getInstance().getStatus(parentItem) == ERepositoryStatus.DELETED) {
-                                parentItem.getState().setDeleted(false);
-                            }
-                        }
-                    }
-
                     // MOD qiongli 2012-10-16 TDQ-6166 notify sql exploere when restore a connection.
                     if (item instanceof DatabaseConnectionItem) {
                         if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/view/RepositoryDropAdapter.java

@@ -62,7 +62,6 @@ import org.talend.core.repository.ui.actions.CopyObjectAction;
 import org.talend.core.repository.ui.actions.MoveObjectAction;
 import org.talend.core.repository.utils.AbstractResourceChangesService;
 import org.talend.core.repository.utils.ConvertJobsUtil;
-import org.talend.core.repository.utils.RepositoryNodeManager;
 import org.talend.core.repository.utils.TDQServiceRegister;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.service.ITransformService;
@@ -380,7 +379,7 @@ public class RepositoryDropAdapter extends PluginDropAdapter {
         if (target == null) {
             return false;
         }
-        // super.validateDrop(target, operation, transferType);
+        super.validateDrop(target, operation, transferType);
         boolean isValid = true;
         Set<IResource> parents = new HashSet<IResource>();
         for (Object obj : ((StructuredSelection) getViewer().getSelection()).toArray()) {
@@ -460,24 +459,6 @@ public class RepositoryDropAdapter extends PluginDropAdapter {
                             }
                         }
                     }
-                } else if (object.getRepositoryObjectType() == ERepositoryObjectType.METADATA_TACOKIT_JDBC) {
-                    if (target instanceof RepositoryNode) {
-                        RepositoryNode targetRN = (RepositoryNode) target;
-                        if (ENodeType.SYSTEM_FOLDER == targetRN.getType() || ENodeType.SIMPLE_FOLDER == targetRN.getType()) {
-                            if (targetRN.getContentType() == ERepositoryObjectType.METADATA_CONNECTIONS) {
-                                return isValid = true;
-                            }
-                        }
-                    }
-                } else if (RepositoryNodeManager.isSnowflake(object.getRepositoryObjectType())) {
-                    if (target instanceof RepositoryNode) {
-                        RepositoryNode targetRN = (RepositoryNode) target;
-                        if (ENodeType.SYSTEM_FOLDER == targetRN.getType() || ENodeType.SIMPLE_FOLDER == targetRN.getType()) {
-                            if (targetRN.getContentType() == ERepositoryObjectType.METADATA_CONNECTIONS) {
-                                return isValid = true;
-                            }
-                        }
-                    }
                 }
 
             }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/RepositoryNodeManager.java

@@ -155,8 +155,4 @@ public class RepositoryNodeManager {
         return isTacokit;
     }
 
-    public static boolean isSnowflake(ERepositoryObjectType type) {
-        return ERepositoryObjectType.SNOWFLAKE != null && ERepositoryObjectType.SNOWFLAKE == type;
-    }
-
 }

main/plugins/org.talend.core.runtime/META-INF/MANIFEST.MF

@@ -6,7 +6,6 @@ Bundle-Version: 8.0.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
 Export-Package: org.talend.analysistask,
- org.talend.commons.report,
  org.talend.commons.utils.generation,
  org.talend.commons.utils.io,
  org.talend.commons.utils.workbench.resources,
@@ -144,7 +143,7 @@ Require-Bundle: org.eclipse.jdt.core,
  com.fasterxml.jackson.core.jackson-annotations,
  com.fasterxml.jackson.core.jackson-databind,
  com.fasterxml.jackson.core.jackson-core,
- avro
+ avro;bundle-version="1.11.2"
 Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,

main/plugins/org.talend.core.runtime/mappings/mapping_PostgresPlus.xml

@@ -0,0 +1,567 @@
+<?xml version="1.0"?>
+<mapping>
+	<dbms product="POSTGRESPLUS" id="postgresplus_id" label="Mapping PostgresPlus"
+		default="true">
+		<dbTypes>
+			<dbType type="ABSTIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="ACLITEM" ignoreLen="true" ignorePre="true" />
+			<dbType type="BIGSERIAL" ignoreLen="true" ignorePre="true" />
+			<dbType type="BIT" ignorePre="true" />
+			<dbType type="BOOL" ignoreLen="true" ignorePre="true" />
+			<dbType type="BOX" ignoreLen="true" ignorePre="true" />
+			<dbType type="BPCHAR" ignoreLen="true" ignorePre="true" />
+			<dbType type="BYTEA" ignoreLen="true" ignorePre="true" />	
+			<dbType type="CHAR" defaultLength="50" ignorePre="true"/>
+			<dbType type="CID" ignoreLen="true" ignorePre="true" />
+			<dbType type="CIDR" ignoreLen="true" ignorePre="true" />
+			<dbType type="CIRCLE" ignoreLen="true" ignorePre="true" />
+			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT4" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT8" ignoreLen="true" ignorePre="true" />
+			<dbType type="INET" ignoreLen="true" ignorePre="true" />
+			<dbType type="INT2" ignoreLen="true" ignorePre="true" />
+			<dbType type="INT2VECTOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="INT4" ignoreLen="true" ignorePre="true" />
+			<dbType type="INT8" ignoreLen="true" ignorePre="true" />
+			<dbType type="INTERVAL" ignorePre="true" />
+			<dbType type="LINE" ignoreLen="true" ignorePre="true" />
+			<dbType type="LSEG" ignoreLen="true" ignorePre="true" />
+			<dbType type="MACADDR" ignoreLen="true" ignorePre="true" />
+			<dbType type="MONEY" ignoreLen="true" ignorePre="true" />	
+			<dbType type="NAME" ignoreLen="true" ignorePre="true" />
+			<dbType type="NUMERIC" defaultLength="20" defaultPrecision="10"/>
+			<dbType type="OID" ignoreLen="true" ignorePre="true"  />
+			<dbType type="OIDVECTOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="PATH" ignoreLen="true" ignorePre="true" />
+			<dbType type="POINT" ignoreLen="true" ignorePre="true"  />
+			<dbType type="POLYGON" ignoreLen="true" ignorePre="true"/>
+			<dbType type="REFCURSOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="RELTIME" ignoreLen="true" ignorePre="true" />			
+			<dbType type="REGCLASS" ignoreLen="true" ignorePre="true" />
+			<dbType type="REGOPER" ignoreLen="true" ignorePre="true" />
+			<dbType type="REGOPERATOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="REGPROC" ignoreLen="true" ignorePre="true" />
+			<dbType type="REGPROCEDURE" ignoreLen="true" ignorePre="true" />
+			<dbType type="REGTYPE" ignoreLen="true" ignorePre="true" />
+			<dbType type="SERIAL" ignoreLen="true" ignorePre="true" />
+			<dbType type="SMGR" ignoreLen="true" ignorePre="true" />
+			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TID" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIME" ignorePre="true" />
+			<dbType type="TINTERVAL" ignoreLen="true" ignorePre="true"  />
+			<dbType type="TIMESTAMPTZ" ignoreLen="true" ignorePre="true"  />
+			<dbType type="TIMESTAMP" ignorePre="true"  />
+			<dbType type="TIMETZ" ignoreLen="true" ignorePre="true"  />
+			<dbType type="VARBIT" ignoreLen="true" ignorePre="true"  />			
+			<dbType type="VARCHAR" defaultLength="200" ignorePre="true" />
+			<dbType type="XID" ignoreLen="true" ignorePre="true"  />
+			
+			<dbType type="_ABSTIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="_ACLITEM" ignoreLen="true" ignorePre="true" />
+			<dbType type="_BIT" ignoreLen="true" ignorePre="true" />
+			<dbType type="_BOX" ignoreLen="true" ignorePre="true" />
+			<dbType type="_BOOL" ignoreLen="true" ignorePre="true" />
+			<dbType type="_BPCHAR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_BYTEA" ignoreLen="true" ignorePre="true" />
+			<dbType type="_CHAR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_CID" ignoreLen="true" ignorePre="true" />
+			<dbType type="_CIDR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_CIRCLE" ignoreLen="true" ignorePre="true" />
+			<dbType type="_DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="_FLOAT4" ignoreLen="true" ignorePre="true" />
+			<dbType type="_FLOAT8" ignoreLen="true" ignorePre="true" />
+			<dbType type="_INET" ignoreLen="true" ignorePre="true" />
+			<dbType type="_INT2VECTOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_INT4" ignoreLen="true" ignorePre="true" />
+			<dbType type="_INT8" ignoreLen="true" ignorePre="true" />
+			<dbType type="_INTERVAL" ignoreLen="true" ignorePre="true" />
+			<dbType type="_LINE" ignoreLen="true" ignorePre="true" />
+			<dbType type="_LSEG" ignoreLen="true" ignorePre="true" />
+			<dbType type="_MACADDR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_MONEY" ignoreLen="true" ignorePre="true" />
+			<dbType type="_NAME" ignoreLen="true" ignorePre="true" />
+			<dbType type="_NUMERIC" ignoreLen="true" ignorePre="true" />
+			<dbType type="_OID" ignoreLen="true" ignorePre="true" />
+			<dbType type="_OIDVECTOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_PATH" ignoreLen="true" ignorePre="true"/>
+			<dbType type="_POINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="_POLYGON" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REFCURSOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REGCLASS" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REGOPER" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REGOPERATOR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REGPROC" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REGPROCEDURE" ignoreLen="true" ignorePre="true" />
+			<dbType type="_REGTYPE" ignoreLen="true" ignorePre="true" />
+			<dbType type="_RELTIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TID" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TIMESTAMP" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TIMESTAMPTZ" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TIMETZ" ignoreLen="true" ignorePre="true" />
+			<dbType type="_TINTERVAL" ignoreLen="true" ignorePre="true" />
+			<dbType type="_VARBIT" ignoreLen="true" ignorePre="true" />
+			<dbType type="_VARCHAR" ignoreLen="true" ignorePre="true" />
+			<dbType type="_XID" ignoreLen="true" ignorePre="true" />
+		</dbTypes>
+
+		<language name="java">
+			<talendToDbTypes><!-- Adviced mappings  -->
+				<talendType type="id_List"/>
+				<talendType type="id_Boolean">	
+					<dbType type="BOOL" default="true" />				
+				</talendType>
+				<talendType type="id_Byte">		
+				</talendType>
+				<talendType type="id_byte[]">
+					<dbType type="BIT" default="true" />
+					<dbType type="VARBIT" />				
+				</talendType>
+				<talendType type="id_Character">
+					<dbType type="CHAR" default="true" />
+					<dbType type="BPCHAR" />
+					<dbType type="VARCHAR" />
+					<dbType type="TEXT" />							
+				</talendType>
+				<talendType type="id_Date">
+					<dbType type="DATE" default="true" />				
+					<dbType type="ABSTIME" />
+					<dbType type="TIMETZ" />
+					<dbType type="TIME" />
+					<dbType type="TIMESTAMPTZ" />
+					<dbType type="TIMESTAMP" />
+					<dbType type="INTERVAL" />
+					<dbType type="TINTERVAL" />
+					<dbType type="RELTIME" />						
+				</talendType>
+				<talendType type="id_BigDecimal">
+					<dbType type="NUMERIC" default="true" />							
+					<dbType type="FLOAT4" />
+					<dbType type="FLOAT8"/>
+				</talendType>
+				<talendType type="id_Double">
+					<dbType type="FLOAT4" />
+					<dbType type="FLOAT8" default="true" />
+					<dbType type="NUMERIC" />							
+				</talendType>
+				<talendType type="id_Float">
+					<dbType type="FLOAT4" default="true" />
+					<dbType type="FLOAT8" />
+					<dbType type="NUMERIC" />				
+				</talendType>
+				<talendType type="id_Integer">
+					<dbType type="INT2" />
+					<dbType type="INT4" default="true" />
+					<dbType type="SERIAL" />
+					<dbType type="INT8" />
+					<dbType type="BIGSERIAL" />										
+				</talendType>
+				<talendType type="id_Long">
+					<dbType type="INT2" />
+					<dbType type="INT4" />
+					<dbType type="SERIAL" />
+					<dbType type="INT8"  default="true" />
+					<dbType type="BIGSERIAL" />							
+				</talendType>
+				<talendType type="id_Object">
+					<dbType type="_POINT" />
+					<dbType type="_POLYGON" />
+					<dbType type="_FLOAT4" />
+					<dbType type="_REFCURSOR" />
+					<dbType type="_REGCLASS" />
+					<dbType type="_REGOPER" />
+					<dbType type="_REGOPERATOR" />
+					<dbType type="_REGPROC" />
+					<dbType type="_REGPROCEDURE" />
+					<dbType type="_REGTYPE" />
+					<dbType type="_RELTIME" />
+					<dbType type="_TEXT" />
+					<dbType type="_TID" />
+					<dbType type="_TIMETZ" />
+					<dbType type="_TIME" />
+					<dbType type="_TIMESTAMPTZ" />
+					<dbType type="_TIMESTAMP" />
+					<dbType type="_TINTERVAL" />
+					<dbType type="_XID" />						
+					<dbType type="ACLITEM" />			
+					<dbType type="BYTEA" />						
+					<dbType type="CID" />
+					<dbType type="CIDR" />
+					<dbType type="CIRCLE" />						
+					<dbType type="INET" />			
+					<dbType type="MACADDR" />
+					<dbType type="MONEY" />			
+					<dbType type="OID" />
+					<dbType type="PATH" />
+					<dbType type="POLYGON" />			
+					<dbType type="REFCURSOR" />
+					<dbType type="REGCLASS" />
+					<dbType type="REGOPER" />
+					<dbType type="REGOPERATOR" />
+					<dbType type="REGPROC" />
+					<dbType type="REGPROCEDURE" />
+					<dbType type="REGTYPE" />						
+					<dbType type="SMGR" />			
+					<dbType type="TID" />
+					<dbType type="XID" />
+					<dbType type="_CHAR" />
+					<dbType type="_ABSTIME" />
+					<dbType type="_ACLITEM" />
+					<dbType type="_INT8" />
+					<dbType type="_VARBIT" />
+					<dbType type="_BIT" />			
+					<dbType type="_BOOL" />
+					<dbType type="BOX" />
+					<dbType type="_BOX" />
+					<dbType type="_BYTEA" />
+					<dbType type="_VARCHAR" />
+					<dbType type="_BPCHAR" />
+					<dbType type="_CID" />
+					<dbType type="_CIDR" />
+					<dbType type="_CIRCLE" />
+					<dbType type="_DATE" />
+					<dbType type="_FLOAT8" />
+					<dbType type="_INET" />
+					<dbType type="INT2VECTOR" />
+					<dbType type="_INT2VECTOR" />
+					<dbType type="_INT4" />
+					<dbType type="_INTERVAL" />
+					<dbType type="LINE" />
+					<dbType type="_LINE" />
+					<dbType type="LSEG" />
+					<dbType type="_LSEG" />
+					<dbType type="_MACADDR" />
+					<dbType type="_MONEY" />
+					<dbType type="NAME" />
+					<dbType type="_NAME" />
+					<dbType type="_NUMERIC" />
+					<dbType type="_OID" />
+					<dbType type="OIDVECTOR" />
+					<dbType type="_OIDVECTOR" />
+					<dbType type="_PATH" />
+					<dbType type="POINT" default="true" />				
+				</talendType>
+				<talendType type="id_Short">
+					<dbType type="INT2"   default="true" />
+					<dbType type="INT4" />
+					<dbType type="SERIAL" />
+					<dbType type="INT8" />
+					<dbType type="BIGSERIAL" />					
+				</talendType>
+				<talendType type="id_String">
+					<dbType type="BPCHAR" />
+					<dbType type="VARCHAR" default="true" />
+					<dbType type="TEXT" />				
+				</talendType>
+			</talendToDbTypes>
+			<dbToTalendTypes>
+				<dbType type="INT2" >
+					<talendType type="id_Short" default="true" />				
+				</dbType>				
+				<dbType type="INT4" >
+					<talendType type="id_Integer" default="true" />
+				</dbType>				
+				<dbType type="SERIAL" >
+					<talendType type="id_Integer" default="true" />				
+				</dbType>				
+				<dbType type="INT8" >
+					<talendType type="id_Long" default="true" />				
+				</dbType>				
+				<dbType type="BIGSERIAL" >
+					<talendType type="id_Long" default="true" />				
+				</dbType>				
+				<dbType type="FLOAT4" >
+					<talendType type="id_Float" default="true" />				
+					<talendType type="id_BigDecimal"/>			
+				</dbType>				
+				<dbType type="FLOAT8" >
+					<talendType type="id_Double" default="true" />				
+					<talendType type="id_BigDecimal"/>			
+				</dbType>
+				<dbType type="NUMERIC">
+					<talendType type="id_Double"/>
+					<talendType type="id_BigDecimal" default="true"/>			
+				</dbType>				
+				<dbType type="BOOL" >
+					<talendType type="id_Boolean" default="true" />				
+				</dbType>				
+				<dbType type="BIT" >
+					<talendType type="id_byte[]" default="true" />	
+				</dbType>				
+				<dbType type="VARBIT" >
+					<talendType type="id_byte[]" default="true" />				
+				</dbType>							
+				<dbType type="CHAR" >
+					<talendType type="id_String" default="true" />				
+				</dbType>				
+				<dbType type="BPCHAR" >
+					<talendType type="id_String" default="true" />				
+				</dbType>				
+				<dbType type="VARCHAR" >
+					<talendType type="id_String" default="true" />				
+				</dbType>				
+				<dbType type="TEXT" >
+					<talendType type="id_String" default="true" />				
+				</dbType>				
+				<dbType type="DATE" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>				
+				<dbType type="ABSTIME" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>				
+				<dbType type="TIMETZ" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>				
+				<dbType type="TIME" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>				
+				<dbType type="TIMESTAMPTZ" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>				
+				<dbType type="TIMESTAMP" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>
+				<dbType type="INTERVAL" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>								
+				<dbType type="TINTERVAL" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>				
+				<dbType type="RELTIME" >
+					<talendType type="id_Date" default="true" />				
+				</dbType>							
+				<dbType type="ACLITEM" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>							
+				<dbType type="BYTEA" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>										
+				<dbType type="CID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="CIDR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="CIRCLE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>										
+				<dbType type="INET" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>							
+				<dbType type="MACADDR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="MONEY" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>							
+				<dbType type="OID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="PATH" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="POLYGON" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>							
+				<dbType type="REFCURSOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="REGCLASS" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="REGOPER" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="REGOPERATOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="REGPROC" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="REGPROCEDURE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="REGTYPE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>										
+				<dbType type="SMGR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>							
+				<dbType type="TID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="XID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="BOX" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="INT2VECTOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="LINE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="LSEG" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="NAME" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="OIDVECTOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="POINT" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>	
+				<!-- object -->
+				<dbType type="_OIDVECTOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_PATH" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_NAME" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_NUMERIC" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_OID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_LSEG" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_MACADDR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_MONEY" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_LINE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_INT2VECTOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_INT4" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_INTERVAL" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_BOX" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_BYTEA" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_VARCHAR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_BPCHAR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_CID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_CIDR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_CIRCLE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_DATE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_FLOAT8" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_INET" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_CHAR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_ABSTIME" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_ACLITEM" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_INT8" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_VARBIT" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_BIT" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>							
+				<dbType type="_BOOL" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>
+				<dbType type="_POINT" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_POLYGON" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_FLOAT4" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REFCURSOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REGCLASS" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REGOPER" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REGOPERATOR" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REGPROC" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REGPROCEDURE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_REGTYPE" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_RELTIME" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TEXT" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TIMETZ" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TIME" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TIMESTAMPTZ" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TIMESTAMP" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_TINTERVAL" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>				
+				<dbType type="_XID" >
+					<talendType type="id_Object" default="true" />				
+				</dbType>									
+			</dbToTalendTypes>
+		</language>
+	</dbms>
+
+</mapping>

main/plugins/org.talend.core.runtime/mappings/mapping_Sybase.xml

@@ -43,9 +43,9 @@
 					<dbType type="BIT" default="true" />				
 				</talendType>
 				<talendType type="id_Byte">
-					<dbType type="INT" default="true" />
+					<dbType type="TINYINT" default="true" />
 					<dbType type="BIGINT" />
-					<dbType type="TINYINT" />
+					<dbType type="INT" />
 					<dbType type="SMALLINT" />			
 				</talendType>
 				<talendType type="id_byte[]">
@@ -204,8 +204,8 @@
 					<talendType type="id_Date" default="true" />
 				</dbType>
 				<dbType type="TINYINT">
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Byte"/>
+					<talendType type="id_Byte" default="true" />
+					<talendType type="id_Integer"/>
 					<talendType type="id_Long"/>
 					<talendType type="id_Short"/>
 				</dbType>

main/plugins/org.talend.core.runtime/resources/module_access.properties

@@ -49,15 +49,11 @@ tDqReportRun=java.base/java.lang,java.base/java.nio
 tWebService=java.base/java.lang
 tWebServiceInput=java.base/java.lang
 
-tRESTClient=java.base/sun.net.www.protocol.https,java.base/java.net
-
 # TCK framework
-TCK_COMMON_ARGS=java.base/java.io,java.base/java.lang.invoke,java.base/java.lang.reflect,java.base/java.lang,java.base/java.net,java.base/java.nio,java.base/java.util,java.base/sun.nio.ch,java.base/sun.net.www.protocol.https
+TCK_COMMON_ARGS=java.base/java.io,java.base/java.lang.invoke,java.base/java.lang.reflect,java.base/java.lang,java.base/java.net,java.base/java.nio,java.base/java.util,java.base/sun.nio.ch
 
 # BigData distribution
-SPARK_3_4_x=java.base/java.nio,java.base/sun.nio.ch,java.base/java.util,java.base/java.lang.invoke,java.base/sun.util.calendar
 SPARK_3_3_x=java.base/java.nio,java.base/sun.nio.ch,java.base/java.util,java.base/java.lang.invoke,java.base/sun.util.calendar
 SPARK_3_2_x=java.base/java.nio,java.base/sun.nio.ch,java.base/java.util,java.base/java.lang.invoke,java.base/sun.util.calendar
 SPARK_3_1_x=java.base/java.nio,java.base/sun.nio.ch,java.base/java.util,java.base/java.lang.invoke,java.base/sun.util.calendar
-SPARK_3_0_x=java.base/java.nio,java.base/sun.nio.ch,java.base/java.util,java.base/java.lang.invoke,java.base/sun.util.calendar
 SPARK_2_4_x=java.base/java.nio,java.base/sun.nio.ch,java.base/java.util,java.base/java.lang.invoke,java.base/sun.util.calendar

main/plugins/org.talend.core.runtime/src/main/java/org/talend/analysistask/ItemAnalysisReportManager.java

@@ -26,12 +26,26 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.widgets.WidgetFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.report.ItemsReportUtil;
-import org.talend.commons.report.ReportAccessDialog;
+import org.talend.commons.utils.io.FilesUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.Item;
@@ -161,10 +175,8 @@ public class ItemAnalysisReportManager {
                     boolean generateSuccess = ItemsReportUtil.generateReportFile(reportFile, ANALYSIS_REPORT_HEAD, recordLines);
                     if (generateSuccess) {
                         Display.getDefault().asyncExec(() -> {
-                            ReportAccessDialog accessDialog = new ReportAccessDialog(
+                            AnalysisReportAccessDialog accessDialog = new AnalysisReportAccessDialog(
                                     PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
-                                    Messages.getString("AnalysisReportAccessDialog.shellTitle"),
-                                    Messages.getString("AnalysisReportAccessDialog.generateSuccess"),
                                     reportFile.getAbsolutePath());
                             accessDialog.open();
                         });
@@ -228,3 +240,76 @@ public class ItemAnalysisReportManager {
     }
 
 }
+
+class AnalysisReportAccessDialog extends Dialog {
+
+    private String reportGeneratedFile;
+
+    protected AnalysisReportAccessDialog(Shell parentShell, String reportGeneratedFile) {
+        super(parentShell);
+        this.reportGeneratedFile = reportGeneratedFile;
+    }
+
+    @Override
+    protected void configureShell(Shell newShell) {
+        super.configureShell(newShell);
+        newShell.setText(Messages.getString("AnalysisReportAccessDialog.shellTitle"));
+    }
+
+    @Override
+    protected void initializeBounds() {
+        getShell().setSize(700, 190);
+        Point location = getInitialLocation(getShell().getSize());
+        getShell().setLocation(location.x, location.y);
+    }
+
+    @Override
+    protected Control createDialogArea(Composite parent) {
+        GridLayout layout = new GridLayout();
+        layout.marginWidth = 0;
+        layout.marginHeight = 0;
+        Composite container = WidgetFactory.composite(SWT.NONE).layout(layout).layoutData(new GridData(GridData.FILL_BOTH))
+                .create(parent);
+        applyDialogFont(container);
+
+        Composite composite = new Composite(container, SWT.NONE);
+        GridLayout compositeLayout = new GridLayout();
+        compositeLayout.numColumns = 1;
+        compositeLayout.marginWidth = 0;
+        compositeLayout.marginTop = 8;
+        compositeLayout.marginLeft = 10;
+        composite.setLayout(compositeLayout);
+        Label successMsgLabel = new Label(composite, SWT.NONE);
+        successMsgLabel.setText(Messages.getString("AnalysisReportAccessDialog.generateSuccess"));
+        GridData gridData = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL);
+        successMsgLabel.setLayoutData(gridData);
+
+        Link accessLink = new Link(composite, SWT.NONE);
+        accessLink.setText(Messages.getString("AnalysisReportAccessDialog.completeReportAvailable") + " <a>"
+                + Messages.getString("AnalysisReportAccessDialog.accessReport") + "</a> ");
+        accessLink.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL));
+        accessLink.addSelectionListener(new SelectionAdapter() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                File reportFile = new File(reportGeneratedFile);
+                if (reportFile != null && reportFile.exists()) {
+                    try {
+                        FilesUtils.selectFileInSystemExplorer(reportFile);
+                    } catch (Exception excep) {
+                        ExceptionHandler.process(excep);
+                    }
+                }
+            }
+
+        });
+
+        return container;
+    }
+
+    @Override
+    protected void createButtonsForButtonBar(Composite parent) {
+        createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/commons/report/ReportAccessDialog.java

@@ -1,128 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2023 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.commons.report;
-
-import java.io.File;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.widgets.WidgetFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.talend.commons.exception.ExceptionHandler;
-import org.talend.commons.utils.io.FilesUtils;
-import org.talend.core.runtime.i18n.Messages;
-
-/**
- * DOC jding  class global comment. Detailled comment
- */
-public class ReportAccessDialog extends Dialog {
-
-    private String shellTitle;
-
-    private String message;
-
-    private String reportGeneratedFile;
-
-    public ReportAccessDialog(Shell parentShell, String shellTitle, String message, String reportGeneratedFile) {
-        super(parentShell);
-        this.shellTitle = shellTitle;
-        this.message = message;
-        this.reportGeneratedFile = reportGeneratedFile;
-    }
-
-    @Override
-    protected void configureShell(Shell newShell) {
-        super.configureShell(newShell);
-        newShell.setText(shellTitle);
-    }
-
-    @Override
-    protected void initializeBounds() {
-        getShell().setSize(700, 190);
-        Point location = getInitialLocation(getShell().getSize());
-        getShell().setLocation(location.x, location.y);
-    }
-
-    @Override
-    protected Control createDialogArea(Composite parent) {
-        GridLayout layout = new GridLayout();
-        layout.marginWidth = 0;
-        layout.marginHeight = 0;
-        Composite container = WidgetFactory.composite(SWT.NONE).layout(layout).layoutData(new GridData(GridData.FILL_BOTH))
-                .create(parent);
-        applyDialogFont(container);
-
-        Composite composite = new Composite(container, SWT.NONE);
-        GridLayout compositeLayout = new GridLayout();
-        compositeLayout.numColumns = 1;
-        compositeLayout.marginWidth = 0;
-        compositeLayout.marginTop = 8;
-        compositeLayout.marginLeft = 10;
-        composite.setLayout(compositeLayout);
-        Label successMsgLabel = new Label(composite, SWT.NONE);
-        successMsgLabel.setText(message);
-        GridData gridData = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL);
-        successMsgLabel.setLayoutData(gridData);
-
-        Composite noteComp = new Composite(composite, SWT.NONE);
-        noteComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
-        noteComp.setLayout(new FormLayout());
-        Label noteLabel = new Label(noteComp, SWT.NONE);
-        noteLabel.setText(Messages.getString("AnalysisReportAccessDialog.completeReportAvailable"));
-        FormData noteLabelFormData = new FormData();
-        noteLabelFormData.bottom = new FormAttachment(100, -5);
-        noteLabelFormData.left = new FormAttachment(0, 0);
-        noteLabel.setLayoutData(noteLabelFormData);
-        Button browseBtn = new Button(noteComp, SWT.NONE);
-        browseBtn.setText(Messages.getString("AnalysisReportAccessDialog.accessBrowse"));
-        FormData linkFormData = new FormData();
-        linkFormData.top = new FormAttachment(0, 0);
-        linkFormData.left = new FormAttachment(noteLabel, 5);
-        browseBtn.setLayoutData(linkFormData);
-        browseBtn.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                File reportFile = new File(reportGeneratedFile);
-                if (reportFile != null && reportFile.exists()) {
-                    try {
-                        FilesUtils.selectFileInSystemExplorer(reportFile);
-                    } catch (Exception excep) {
-                        ExceptionHandler.process(excep);
-                    }
-                }
-            }
-
-        });
-        return container;
-    }
-
-    @Override
-    protected void createButtonsForButtonBar(Composite parent) {
-        createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-    }
-
-}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/commons/utils/generation/JavaUtils.java

@@ -39,9 +39,6 @@ import org.talend.core.GlobalServiceRegister;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
 import org.talend.designer.runprocess.IRunProcessService;
-import org.talend.utils.JavaVersion;
-import org.talend.utils.StudioKeysFileCheck;
-import org.talend.utils.VersionException;
 
 /**
  * Utilities around perl stuff. <br/>
@@ -251,7 +248,7 @@ public final class JavaUtils {
         setProjectJavaVserion(javaVersion);
         applyCompilerCompliance(javaVersion);
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
-            IRunProcessService service = GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
+            IRunProcessService service = (IRunProcessService) GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
             service.updateProjectPomWithTemplate();
         }
     }
@@ -287,10 +284,6 @@ public final class JavaUtils {
         if (version == null) {
             return defaultCompliance;
         }
-        JavaVersion ver = new JavaVersion(version);
-        if (ver.getMajor() > 8) {
-            return String.valueOf(ver.getMajor());
-        }
         if (version.startsWith(JavaCore.VERSION_1_8)) {
             return JavaCore.VERSION_1_8;
         }
@@ -371,39 +364,5 @@ public final class JavaUtils {
             monitor.worked(1);
         }
     }
-    
-    public static void validateJavaVersion() {
-        try {
-            // validate jvm which is used to start studio
-            StudioKeysFileCheck.validateJavaVersion();
-
-            // validate default complier's compliance level
-            IVMInstall install = JavaRuntime.getDefaultVMInstall();
-            String ver = getCompilerCompliance((IVMInstall2) install, JavaCore.VERSION_1_8);
-            if (new JavaVersion(ver).compareTo(new JavaVersion(StudioKeysFileCheck.JAVA_VERSION_MAXIMUM_STRING)) > 0) {
-                VersionException e = new VersionException(VersionException.ERR_JAVA_VERSION_NOT_SUPPORTED,
-                        "The maximum Java version supported by Studio is " + StudioKeysFileCheck.JAVA_VERSION_MAXIMUM_STRING + ". Your compiler's compliance level is " + ver);
-                throw e;
-            }
-        } catch (Exception e1) {
-            if (e1 instanceof VersionException) {
-                throw e1;
-            }
-            ExceptionHandler.process(e1);
-        }
-    }
-
-    public static boolean isJava17() {
-        boolean isJava17 = false;
-        String javaVersion = System.getProperty("java.version");
-        String[] arr = javaVersion.split("[^\\d]+");
-        try {
-            isJava17 = Integer.parseInt(arr[0]) >= 17;
-        } catch (NumberFormatException e) {
-            ExceptionHandler.process(e);
-            isJava17 = false;
-        }
-        return isJava17;
-    }
 
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ILibraryManagerUIService.java

@@ -54,6 +54,4 @@ public interface ILibraryManagerUIService extends IService {
     public boolean confirmDialog(String originalJarFileName);
 
     public IConfigModuleDialog getConfigModuleDialog(Shell parentShell, String initValue, boolean allowDetectDependencies);
-
-    public String getLicenseUrlByName(String licenceName);
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ITDQRepositoryService.java

@@ -60,6 +60,8 @@ public interface ITDQRepositoryService extends IService {
      */
     public void notifySQLExplorer(Item... items);
 
+    public void fillMetadata(ConnectionItem connItem);
+
     public void refresh();
 
     // Added 20120503 yyin

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabase4DriverClassName.java

@@ -66,6 +66,7 @@ public enum EDatabase4DriverClassName {
     // Take care, PSQL is set as first here since actually the audit will take the first db with the postgresql driver
     // if change the order, it might break the audit for PSQL.
     PSQL(EDatabaseTypeName.PSQL, "org.postgresql.Driver"), //$NON-NLS-1$
+    PLUSPSQL(EDatabaseTypeName.PLUSPSQL, "org.postgresql.Driver"), //$NON-NLS-1$
     GREENPLUM(EDatabaseTypeName.GREENPLUM, "com.pivotal.jdbc.GreenplumDriver"), //$NON-NLS-1$
     GREENPLUM_PSQL(EDatabaseTypeName.GREENPLUM, "org.postgresql.Driver"), //$NON-NLS-1$
     SAS(EDatabaseTypeName.SAS, "com.sas.rio.MVADriver"), //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabaseTypeName.java

@@ -118,7 +118,6 @@ public enum EDatabaseTypeName {
     // General JDBC not support schema defalut
     GENERAL_JDBC(
             "General JDBC", "General JDBC", Boolean.FALSE, "JDBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    
     EXASOL(
             "Exasol", "Exasol", Boolean.TRUE, "Exasol", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/template/EDatabaseConnTemplate.java

@@ -49,6 +49,10 @@ public enum EDatabaseConnTemplate {
             "jdbc:postgresql://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
             "5432")), //$NON-NLS-1$
 
+    PLUSPSQL(new DbConnStr(EDatabaseTypeName.PLUSPSQL, //
+            "jdbc:postgresql://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
+            "5432")), //$NON-NLS-1$
+
     GREENPLUM(new DbConnStr(EDatabaseTypeName.GREENPLUM, //
             "jdbc:pivotal:greenplum://<host>:<port>;;DatabaseName=<sid>;<property>", //$NON-NLS-1$
             "5432")), //$NON-NLS-1$
@@ -378,6 +382,7 @@ public enum EDatabaseConnTemplate {
             case ORACLE_OCI:
             case ORACLE_CUSTOM:
             case PSQL:
+            case PLUSPSQL:
             case GREENPLUM:
             case REDSHIFT:
             case REDSHIFT_SSO:
@@ -421,6 +426,7 @@ public enum EDatabaseConnTemplate {
             case REDSHIFT_SSO:
             case SAPHana:
             case PSQL:
+            case PLUSPSQL:
             case GREENPLUM:
             case INGRES:
             case VECTORWISE:
@@ -464,6 +470,7 @@ public enum EDatabaseConnTemplate {
             case HSQLDB_IN_PROGRESS:
             case MAXDB:
             case PSQL:
+            case PLUSPSQL:
                 return true;
             default:
             }

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

@@ -22,7 +22,7 @@ import org.talend.core.database.EDatabaseTypeName;
  */
 public class DbVersion4DriversForOracle11 extends DbVersion4Drivers {
 
-    public static final String DRIVER_1_6 = "ojdbc6-11.2.0.4.jar"; //$NON-NLS-1$
+    public static final String DRIVER_1_6 = "ojdbc6.jar"; //$NON-NLS-1$
 
     public static final String DRIVER_1_5 = "ojdbc5.jar"; //$NON-NLS-1$
 

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

@@ -54,12 +54,12 @@ public enum EDatabaseVersion4Drivers {
     H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-2.1.214.jar")), //$NON-NLS-1$
 
     //
-    JAVADB_EMBEDED(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_EMBEDED, "derby-10.14.2.0.jar")), //$NON-NLS-1$
+    JAVADB_EMBEDED(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_EMBEDED, "derby.jar")), //$NON-NLS-1$
     SQLITE(new DbVersion4Drivers(EDatabaseTypeName.SQLITE, "sqlite-jdbc-3.40.0.0.jar")), //$NON-NLS-1$
-    FIREBIRD(new DbVersion4Drivers(EDatabaseTypeName.FIREBIRD, "jaybird-2.1.1.jar")), //$NON-NLS-1$
+    FIREBIRD(new DbVersion4Drivers(EDatabaseTypeName.FIREBIRD, "jaybird-full-2.1.1.jar")), //$NON-NLS-1$
     TERADATA(new DbVersion4Drivers(EDatabaseTypeName.TERADATA,
             new String[] { "terajdbc4-17.10.00.27.jar" })), //$NON-NLS-1$
-    JAVADB_DERBYCLIENT(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_DERBYCLIENT, "derbyclient-10.14.2.0.jar")), //$NON-NLS-1$
+    JAVADB_DERBYCLIENT(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_DERBYCLIENT, "derbyclient.jar")), //$NON-NLS-1$
     NETEZZA(new DbVersion4Drivers(EDatabaseTypeName.NETEZZA, "nzjdbc.jar")), //$NON-NLS-1$
     INFORMIX(new DbVersion4Drivers(EDatabaseTypeName.INFORMIX, "ifxjdbc.jar")), //$NON-NLS-1$
 
@@ -96,6 +96,9 @@ public enum EDatabaseVersion4Drivers {
     PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.6.0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     PSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "Prior to v9 (Deprecated)", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
+    PLUSPSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL,
+            "Prior to v9 (Deprecated)", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.6.0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     IBMDB2(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
             "db2jcc_license_cisuz.jar" })), //$NON-NLS-1$
     IBMDB2ZOS(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2ZOS, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$

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

@@ -45,8 +45,6 @@ import org.talend.designer.core.model.utils.emf.talendfile.TalendFileFactory;
  */
 public class JobContextManager implements IContextManager {
 
-    private boolean isWrapContextText;
-
     private IContext defaultContext = new JobContext(IContext.DEFAULT);
 
     private List<IContext> listContext = new ArrayList<IContext>();
@@ -104,14 +102,6 @@ public class JobContextManager implements IContextManager {
 
     private Map<ContextItem, List<IContext>> renameContextGroupMap = new HashMap<ContextItem, List<IContext>>();
 
-    public boolean isWrapContextText() {
-        return isWrapContextText;
-    }
-
-    public void setWrapContextText(boolean isWrapContextText) {
-        this.isWrapContextText = isWrapContextText;
-    }
-
     public Map<ContextItem, List<IContext>> getAddContextGroupMap() {
         return this.addContextGroupMap;
     }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/IMetadataColumn.java

@@ -109,10 +109,6 @@ public interface IMetadataColumn {
 
     public void setComment(String comment);
 
-    public int getRowNum();
-
-    public void setRowNum(int value);
-
     public IMetadataColumn clone();
 
     public IMetadataColumn clone(boolean withCustoms);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataColumn.java

@@ -346,15 +346,6 @@ public class MetadataColumn implements IMetadataColumn, Cloneable {
         return this.comment;
     }
 
-    int rowNum = 0;
-
-    public int getRowNum() {
-        return rowNum;
-    };
-
-    public void setRowNum(int value) {
-        this.rowNum = value;
-    }
     /*
      * (non-Javadoc)
      *

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/builder/ConvertionHelper.java

@@ -52,7 +52,6 @@ import org.talend.core.model.metadata.builder.connection.MDMConnection;
 import org.talend.core.model.metadata.builder.connection.MetadataColumn;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.metadata.builder.connection.SAPBWTable;
-import org.talend.core.model.metadata.builder.connection.TacokitDatabaseConnection;
 import org.talend.core.prefs.SSLPreferenceConstants;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.utils.KeywordsValidator;
@@ -786,17 +785,4 @@ public final class ConvertionHelper {
         }
         return entryString;
     }
-
-    public static DatabaseConnection fillJDBCParams4TacokitDatabaseConnection(Connection conn) {
-        if (conn instanceof TacokitDatabaseConnection) {
-            TacokitDatabaseConnection tacokitDatabaseConnection = (TacokitDatabaseConnection) (conn);
-            if (tacokitDatabaseConnection.getDbmsId() == null) {
-                String trueDbType = getDbTypeByClassNameAndDriverJar(tacokitDatabaseConnection.getDriverClass(), null);
-                String product = EDatabaseTypeName.getTypeFromDisplayName(trueDbType).getProduct();
-                String mapping = MetadataTalendType.getDefaultDbmsFromProduct(product).getId();
-                tacokitDatabaseConnection.setDbmsId(mapping);
-            }
-        }
-        return (DatabaseConnection) conn;
-    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java

@@ -76,7 +76,6 @@ import org.talend.core.model.metadata.builder.connection.SAPFunctionUnit;
 import org.talend.core.model.metadata.builder.connection.SalesforceModuleUnit;
 import org.talend.core.model.metadata.builder.connection.SalesforceSchemaConnection;
 import org.talend.core.model.metadata.builder.connection.SchemaTarget;
-import org.talend.core.model.metadata.builder.connection.TacokitDatabaseConnection;
 import org.talend.core.model.metadata.builder.connection.WSDLParameter;
 import org.talend.core.model.metadata.builder.connection.WSDLSchemaConnection;
 import org.talend.core.model.metadata.builder.connection.XMLFileNode;
@@ -1035,9 +1034,6 @@ public class RepositoryToComponentProperty {
                 return typeByProduct;
             }
         }
-        if (connection instanceof TacokitDatabaseConnection) {
-            return getTacokitDatabaseConnectionValue((TacokitDatabaseConnection)connection, value, table, targetComponent);
-        }
         if (value.equals("FRAMEWORK_TYPE")) { //$NON-NLS-1$
             if (isContextMode(connection, databaseType)) {
                 if (databaseType.equals("JavaDB Embeded")) { //$NON-NLS-1$
@@ -1180,6 +1176,7 @@ public class RepositoryToComponentProperty {
                         || EDatabaseConnTemplate.ORACLE_CUSTOM.getDBDisplayName().equals(databaseType)
                         || EDatabaseConnTemplate.ORACLEFORSID.getDBDisplayName().equals(databaseType)
                         || EDatabaseConnTemplate.ORACLESN.getDBDisplayName().equals(databaseType)
+                        || EDatabaseConnTemplate.PLUSPSQL.getDBDisplayName().equals(databaseType)
                         || EDatabaseConnTemplate.PSQL.getDBDisplayName().equals(databaseType)
                         || EDatabaseConnTemplate.SAPHana.getDBDisplayName().equals(databaseType)
                         || EDatabaseConnTemplate.MSSQL.getDBDisplayName().equals(databaseType)) {
@@ -1320,7 +1317,7 @@ public class RepositoryToComponentProperty {
             }
             return value2;
 
-        }     
+        }
         
         if(value.equals("SUPPORT_NLS")) {
             return connection.isSupportNLS();
@@ -1895,122 +1892,6 @@ public class RepositoryToComponentProperty {
         }
         return null;
     }
-    
-    private static Object getTacokitDatabaseConnectionValue(TacokitDatabaseConnection connection, String value,
-            IMetadataTable table, String targetComponent) {
-        if (TacokitDatabaseConnection.KEY_DATASTORE_URL.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_URL.equals(value)
-                || TacokitDatabaseConnection.KEY_URL.equals(value) || "URL".equals(value)) {
-            return getAppropriateValue(connection, connection.getURL());
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_HOST.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_HOST.equals(value)
-                || TacokitDatabaseConnection.KEY_HOST.equals(value)) {
-            return getAppropriateValue(connection, connection.getServerName());
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_PORT.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_PORT.equals(value)
-                || TacokitDatabaseConnection.KEY_PORT.equals(value)) {
-            return getAppropriateValue(connection, connection.getPort());
-        }
-        if (TacokitDatabaseConnection.KEY_DRIVER.equals(value)) {
-            return connection.getDrivers();
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_DRIVER.equals(value) || "DRIVER_JAR".equals(value)) {
-            List<Map<String, Object>> drivers = new ArrayList<Map<String, Object>>();
-            // map to datastore key
-            for (Map<String, Object> map : connection.getDrivers()) {
-                HashMap<String, Object> newMap = new HashMap<String, Object>();
-                for (Map.Entry<String, Object> entry : map.entrySet()) {
-                    if (TacokitDatabaseConnection.KEY_DRIVER_PATH.equals(entry.getKey()) || TacokitDatabaseConnection.KEY_DATASTORE_DRIVER_PATH.equals(entry.getKey())) {
-                        newMap.put(TacokitDatabaseConnection.KEY_DATASTORE_DRIVER_PATH, entry.getValue());
-                    }
-                }
-                drivers.add(newMap);
-            }
-            return drivers;
-        }
-        if (TacokitDatabaseConnection.KEY_SP_DATASTORE_DRIVER.equals(value)) {
-            List<Map<String, Object>> drivers = new ArrayList<>();
-            for (Map<String, Object> map : connection.getDrivers()) {
-                HashMap<String, Object> newMap = new HashMap<>();
-                for (Map.Entry<String, Object> entry : map.entrySet()) {
-                    if (TacokitDatabaseConnection.KEY_DRIVER_PATH.equals(entry.getKey())
-                            || TacokitDatabaseConnection.KEY_SP_DATASTORE_DRIVER_PATH.equals(entry.getKey())) {
-                        newMap.put(TacokitDatabaseConnection.KEY_SP_DATASTORE_DRIVER_PATH, entry.getValue());
-                    }
-                }
-                drivers.add(newMap);
-            }
-            return drivers;
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_DRIVER_CLASS.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_DRIVER_CLASS.equals(value)
-                || TacokitDatabaseConnection.KEY_DRIVER_CLASS.equals(value) || "DRIVER_CLASS".equals(value)) {
-            return getAppropriateValue(connection, connection.getDriverClass());
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_USER_ID.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_USER_ID.equals(value)
-                || TacokitDatabaseConnection.KEY_USER_ID.equals(value) || "USERNAME".equals(value)) {
-            return getAppropriateValue(connection, connection.getUsername());
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_PASSWORD.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_PASSWORD.equals(value)
-                || TacokitDatabaseConnection.KEY_PASSWORD.equals(value) || "PASSWORD".equals(value)) {
-            return getAppropriateValue(connection, connection.getRawPassword());
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_DATABASE_MAPPING.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_DATABASE_MAPPING.equals(value)
-                || TacokitDatabaseConnection.KEY_DATABASE_MAPPING.equals(value)) {
-            return getAppropriateValue(connection, connection.getDatabaseMappingFile());
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_DATASOURCE_ALIAS.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_DATASOURCE_ALIAS.equals(value)
-                || TacokitDatabaseConnection.KEY_DATASOURCE_ALIAS.equals(value)) {
-            return getAppropriateValue(connection, connection.getDatasourceAlias());
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_USE_SHARED_DB_CONNECTION.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_USE_SHARED_DB_CONNECTION.equals(value)
-                || TacokitDatabaseConnection.KEY_USE_SHARED_DB_CONNECTION.equals(value)) {
-            return connection.useSharedDBConnection();
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_SHARED_DB_CONNECTION.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_SHARED_DB_CONNECTION.equals(value)
-                || TacokitDatabaseConnection.KEY_SHARED_DB_CONNECTION.equals(value)) {
-            return getAppropriateValue(connection, connection.getSharedDBConnectionName());
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_USE_DATASOURCE.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_USE_DATASOURCE.equals(value)
-                || TacokitDatabaseConnection.KEY_USE_DATASOURCE.equals(value)) {
-            return connection.useDatasourceAlias();
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_AUTHENTICATION_TYPE.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_AUTHENTICATION_TYPE.equals(value)
-                || TacokitDatabaseConnection.KEY_AUTHENTICATION_TYPE.equals(value)) {
-            return getAppropriateValue(connection, connection.getAuthenticationType());
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_USE_AUTO_COMMIT.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_USE_AUTO_COMMIT.equals(value)
-                || TacokitDatabaseConnection.KEY_USE_AUTO_COMMIT.equals(value)) {
-            return connection.useAutoCommit();
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_AUTO_COMMIT.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_AUTO_COMMIT.equals(value)
-                || TacokitDatabaseConnection.KEY_AUTO_COMMIT.equals(value)) {
-            return connection.autoCommit();
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_ENABLE_DB_TYPE.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_ENABLE_DB_TYPE.equals(value)
-                || TacokitDatabaseConnection.KEY_ENABLE_DB_TYPE.equals(value)) {
-            return connection.enableDBType();
-        }
-        if (TacokitDatabaseConnection.KEY_DATASTORE_DB_TYPE.equals(value)
-                || TacokitDatabaseConnection.KEY_SP_DATASTORE_DB_TYPE.equals(value)
-                || TacokitDatabaseConnection.KEY_DB_TYPE.equals(value)) {
-            return connection.getDatabaseType();
-        }
-        return connection.getPropertyValue(value);
-    }
 
     private static String getAppropriateValue(Connection connection, String rawValue) {
         if (isContextMode(connection, rawValue)) {
@@ -2020,6 +1901,17 @@ public class RepositoryToComponentProperty {
         }
     }
 
+    /**
+     * DOC nrousseau Comment method "getDatabaseValue".
+     *
+     * @param connection
+     * @param value
+     * @return
+     */
+    private static Object getDatabaseValue(DatabaseConnection connection, String value) {
+        return getDatabaseValue(connection, value, null, null);
+    }
+
     private static boolean isContextMode(Connection connection, String value) {
         IMetadataManagmentUiService mmService = null;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IMetadataManagmentUiService.class)) {
@@ -3223,7 +3115,7 @@ public class RepositoryToComponentProperty {
             String paramName) {
         for (IDragAndDropServiceHandler handler : DragAndDropManager.getHandlers()) {
             if (handler.canHandle(connection)) {
-                return handler.isGenericRepositoryValue(connection, componentProperties, paramName);
+                return handler.isGenericRepositoryValue(componentProperties, paramName);
             }
         }
         return false;
@@ -3233,7 +3125,7 @@ public class RepositoryToComponentProperty {
             String paramName) {
         for (IDragAndDropServiceHandler handler : DragAndDropManager.getHandlers()) {
             if (handler.canHandle(connection)) {
-                return handler.getGenericRepositoryValue(connection, componentProperties, paramName);
+                return handler.getGenericRepositoryValue(componentProperties, paramName);
             }
         }
         return null;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ElementParameterParser.java

@@ -629,7 +629,7 @@ public final class ElementParameterParser {
                 return processItem.getProperty().getLabel();
             }
             // hywang add for 6484
-            else if ("SELECTED_FILE".equals(param.calcRepositoryValue())) { //$NON-NLS-1$
+            else if ("SELECTED_FILE".equals(param.getRepositoryValue())) { //$NON-NLS-1$
                 IElementParameter propertyParam = param.getElement().getElementParameter("PROPERTY:REPOSITORY_PROPERTY_TYPE"); //$NON-NLS-1$
                 if (propertyParam != null && propertyParam.getValue() != null && !propertyParam.getValue().equals("")) { //$NON-NLS-1$
                     try {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/IElementParameter.java

@@ -84,30 +84,10 @@ public interface IElementParameter {
 
     public Object[] getListItemsValue();
 
-    public String calcRepositoryValue();
-
-    /**
-     * use {@link #calcRepositoryValue()} instead
-     */
-    @Deprecated
-    default public String getRepositoryValue() {
-        return calcRepositoryValue();
-    }
-
-    default public String getRawRepositoryValue() {
-        return calcRepositoryValue();
-    }
+    public String getRepositoryValue();
 
     public void setRepositoryValue(String repositoryValue);
 
-    default public String getRepositoryValueIf() {
-        return null;
-    }
-
-    default public void setRepositoryValueIf(String repositoryValue) {
-
-    }
-
     public String getRepositoryProperty();
 
     public void setRepositoryProperty(String repositoryProperty);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/ERepositoryObjectType.java

@@ -69,7 +69,6 @@ import org.talend.core.model.properties.SalesforceSchemaConnectionItem;
 import org.talend.core.model.properties.SnippetItem;
 import org.talend.core.model.properties.SnippetVariable;
 import org.talend.core.model.properties.TDQItem;
-import org.talend.core.model.properties.TacokitDatabaseConnectionItem;
 import org.talend.core.model.properties.ValidationRulesConnectionItem;
 import org.talend.core.model.properties.WSDLSchemaConnectionItem;
 import org.talend.core.model.properties.XmlFileConnectionItem;
@@ -593,14 +592,6 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
             .valueOf("METADATA_SAP_BW_INFOOBJECT"); //$NON-NLS-1$
 
     public final static ERepositoryObjectType JDBC = ERepositoryObjectType.valueOf("JDBC"); //$NON-NLS-1$
-    
-    public static final ERepositoryObjectType METADATA_TACOKIT_JDBC = ERepositoryObjectType
-            .valueOf("repository.metadata.tacokit.jdbc.jdbcdatastore"); //$NON-NLS-1$
-
-    /**
-     * <font color="red">This value may be <b>null</b> if Snowflake is not installed, <b>should add NPE check</b></font>
-     */
-    public final static ERepositoryObjectType SNOWFLAKE = ERepositoryObjectType.valueOf("Snowflake"); //$NON-NLS-1$
 
     private static Map<String, ERepositoryObjectType> typeCacheById = new HashMap<String, ERepositoryObjectType>();
 
@@ -1084,10 +1075,6 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
             public Object caseDatabaseConnectionItem(DatabaseConnectionItem object) {
                 return METADATA_CONNECTIONS;
             }
-            
-            public Object caseTacokitDatabaseConnectionItem(TacokitDatabaseConnectionItem object) {
-                return METADATA_TACOKIT_JDBC;
-            }
 
             @Override
             public Object caseSAPConnectionItem(SAPConnectionItem object) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/RepositoryUpdateManager.java

@@ -102,7 +102,6 @@ import org.talend.designer.core.model.utils.emf.talendfile.ContextParameterType;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
 import org.talend.designer.runprocess.ItemCacheManager;
 import org.talend.repository.model.IProxyRepositoryFactory;
-import org.talend.repository.model.IRepositoryNode;
 import org.talend.repository.model.IRepositoryService;
 import org.talend.repository.model.RepositoryNode;
 
@@ -1924,7 +1923,7 @@ public abstract class RepositoryUpdateManager {
         return updateQueryObject(query, true, false);
     }
 
-    public static boolean updateQuery(Query query, IRepositoryNode node) {
+    public static boolean updateQuery(Query query, RepositoryNode node) {
         return updateQueryObject(query, true, false, node);
     }
 
@@ -1966,7 +1965,7 @@ public abstract class RepositoryUpdateManager {
         return repositoryUpdateManager.doWork(show, onlySimpleShow);
     }
 
-    private static boolean updateQueryObject(Object parameter, boolean show, boolean onlySimpleShow, IRepositoryNode node) {
+    private static boolean updateQueryObject(Object parameter, boolean show, boolean onlySimpleShow, RepositoryNode node) {
         Item item = node.getObject().getProperty().getItem();
         List<Relation> relations = null;
         if (parameter instanceof Query) {

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

@@ -60,7 +60,7 @@ public abstract class AbstractDragAndDropServiceHandler implements IDragAndDropS
     }
 
     @Override
-    public boolean isGenericRepositoryValue(Connection connection, List<ComponentProperties> componentProperties, String paramName) {
+    public boolean isGenericRepositoryValue(List<ComponentProperties> componentProperties, String paramName) {
         return false;
     }
 
@@ -71,12 +71,12 @@ public abstract class AbstractDragAndDropServiceHandler implements IDragAndDropS
      * java.lang.String)
      */
     @Override
-    public Object getGenericRepositoryValue(Connection connection, List<ComponentProperties> componentProperties, String paramName) {
+    public Object getGenericRepositoryValue(List<ComponentProperties> componentProperties, String paramName) {
         return null;
     }
 
     @Override
-    public boolean isGenericPropertiesValue(Connection connection, String paramName){
+    public boolean isGenericPropertiesValue(String paramName){
         return false;
     }
 }

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

@@ -119,9 +119,9 @@ public interface IDragAndDropServiceHandler {
      * @param paramName
      * @return
      */
-    public boolean isGenericRepositoryValue(Connection connection, List<ComponentProperties> componentProperties, String paramName);
+    public boolean isGenericRepositoryValue(List<ComponentProperties> componentProperties, String paramName);
 
-    public Object getGenericRepositoryValue(Connection connection, List<ComponentProperties> componentProperties, String paramName);
+    public Object getGenericRepositoryValue(List<ComponentProperties> componentProperties, String paramName);
 
-    public boolean isGenericPropertiesValue(Connection connection, String paramName);
+    public boolean isGenericPropertiesValue(String paramName);
 }

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

@@ -856,8 +856,7 @@ public final class ParameterValueUtil {
         if (param != null) {
             Object docValue = param.getValue();
             if (docValue != null) {
-                String repositoryValue = param.calcRepositoryValue();
-                if ((repositoryValue != null && repositoryValue.toUpperCase().contains("PASSWORD") //$NON-NLS-1$
+                if ((param.getRepositoryValue() != null && param.getRepositoryValue().toUpperCase().contains("PASSWORD") //$NON-NLS-1$
                         || EParameterFieldType.isPassword(param.getFieldType()))//
                         && !ContextParameterUtils.containContextVariables((String) docValue)) {
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages.properties

@@ -640,7 +640,7 @@ TalendLibsServerManager.cannotGetUserLibraryServer=Cannot get the user library s
 MigrationReportAccessDialog.title=Project items migration
 MigrationReportAccessDialog.migrateSuccess=Project items migrated successfully.
 MigrationReportAccessDialog.completeReportAvailable=Check the report
-MigrationReportAccessDialog.accessBrowse=Browse...
+MigrationReportAccessDialog.accessReport=here
 MigrationReportAccessDialog.provideAnalysisTool=You can run project analysis now to analyze your migrated project. This experimental tool will generate a report containing:
 MigrationReportAccessDialog.listOfProblems=- List of items to fix manually.
 MigrationReportAccessDialog.listItems=- List of items to check.
@@ -655,7 +655,7 @@ ItemAnalysisReportManager.Warning.message=Can't run a new analysis now. Wait for
 AnalysisReportAccessDialog.shellTitle=Project analysis
 AnalysisReportAccessDialog.generateSuccess=Project analysis completed successfully.
 AnalysisReportAccessDialog.completeReportAvailable=Check the report
-AnalysisReportAccessDialog.accessBrowse=Browse...
+AnalysisReportAccessDialog.accessReport=here
 AbstractPomTemplateProjectSettingPage.defaultTabLabel=Default
 AbstractPomTemplateProjectSettingPage.customTabLabel=Custom
 AbstractPomTemplateProjectSettingPage.previewButton=Preview

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_fr.properties

@@ -492,8 +492,8 @@ EUpdateResult.Reload=Recharger les composants
 EUpdateResult.Rename=Changer le nom
 EUpdateResult.Add=Ajouter \u00E0 partir du r\u00E9f\u00E9rentiel
 EUpdateResult.Delete=Supprimer du r\u00E9f\u00E9rentiel
-UpdatesConstants.ContextVariable=Variable de contexte
-UpdatesConstants.ContextEnvironment=Environnement de contexte
+UpdatesConstants.Context=Contexte
+UpdatesConstants.ContextGroup=Groupe de contextes
 UpdatesConstants.Component=Composant
 UpdatesConstants.Joblet=Joblet
 UpdatesConstants.Spark_Joblet=Spark_Joblet
@@ -640,7 +640,7 @@ TalendLibsServerManager.cannotGetUserLibraryServer=Impossible d'obtenir le serve
 MigrationReportAccessDialog.title=Migration des \u00E9l\u00E9ments du projet
 MigrationReportAccessDialog.migrateSuccess=Les \u00E9l\u00E9ments du projet ont bien \u00E9t\u00E9 migr\u00E9s.
 MigrationReportAccessDialog.completeReportAvailable=Consulter le rapport
-MigrationReportAccessDialog.accessBrowse=Parcourir...
+MigrationReportAccessDialog.accessReport=ici
 MigrationReportAccessDialog.provideAnalysisTool=Vous pouvez ex\u00E9cuter une analyse de projet pour analyser votre projet migr\u00E9. Cet outil exp\u00E9rimental va g\u00E9n\u00E9rer un rapport contenant\u00A0:
 MigrationReportAccessDialog.listOfProblems=- la liste des \u00E9l\u00E9ments \u00E0 corriger manuellement,
 MigrationReportAccessDialog.listItems=- la liste des \u00E9l\u00E9ments \u00E0 v\u00E9rifier.
@@ -655,7 +655,7 @@ ItemAnalysisReportManager.Warning.message=Impossible d'ex\u00E9cuter une analyse
 AnalysisReportAccessDialog.shellTitle=Analyse du projet
 AnalysisReportAccessDialog.generateSuccess=Analyse du projet termin\u00E9e.
 AnalysisReportAccessDialog.completeReportAvailable=Consulter le rapport
-AnalysisReportAccessDialog.accessBrowse=Parcourir...
+AnalysisReportAccessDialog.accessReport=ici
 AbstractPomTemplateProjectSettingPage.defaultTabLabel=Par d\u00E9faut
 AbstractPomTemplateProjectSettingPage.customTabLabel=Personnalis\u00E9
 AbstractPomTemplateProjectSettingPage.previewButton=Aper\u00E7u

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_ja.properties

@@ -492,8 +492,8 @@ EUpdateResult.Reload=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30EA\u30E
 EUpdateResult.Rename=\u540D\u524D\u3092\u5909\u66F4
 EUpdateResult.Add=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u8FFD\u52A0
 EUpdateResult.Delete=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u524A\u9664
-UpdatesConstants.ContextVariable=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u5909\u6570
-UpdatesConstants.ContextEnvironment=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u74B0\u5883
+UpdatesConstants.Context=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8
+UpdatesConstants.ContextGroup=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7
 UpdatesConstants.Component=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
 UpdatesConstants.Joblet=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8
 UpdatesConstants.Spark_Joblet=Spark_Joblet
@@ -640,7 +640,7 @@ TalendLibsServerManager.cannotGetUserLibraryServer=\u30EA\u30E2\u30FC\u30C8\u7BA
 MigrationReportAccessDialog.title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u9805\u76EE\u3092\u79FB\u884C
 MigrationReportAccessDialog.migrateSuccess=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u9805\u76EE\u304C\u6B63\u3057\u304F\u79FB\u884C\u3055\u308C\u307E\u3057\u305F\u3002
 MigrationReportAccessDialog.completeReportAvailable=\u30EC\u30DD\u30FC\u30C8\u3092\u30C1\u30A7\u30C3\u30AF
-MigrationReportAccessDialog.accessBrowse=\u53C2\u7167...
+MigrationReportAccessDialog.accessReport=\u3053\u3061\u3089
 MigrationReportAccessDialog.provideAnalysisTool=\u4ECA\u3059\u3050\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790\u3092\u5B9F\u884C\u3057\u3066\u3001\u79FB\u884C\u3055\u308C\u305F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5206\u6790\u3067\u304D\u307E\u3059\u3002\u3053\u306E\u8A66\u9A13\u7684\u306A\u30C4\u30FC\u30EB\u306B\u3088\u3063\u3066\u3001\u4EE5\u4E0B\u304C\u542B\u307E\u308C\u308B\u30EC\u30DD\u30FC\u30C8\u304C\u751F\u6210\u3055\u308C\u307E\u3059:
 MigrationReportAccessDialog.listOfProblems=- \u624B\u52D5\u3067\u4FEE\u6B63\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u306E\u30EA\u30B9\u30C8\u3002
 MigrationReportAccessDialog.listItems=- \u30C1\u30A7\u30C3\u30AF\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u306E\u30EA\u30B9\u30C8\u3002
@@ -655,7 +655,7 @@ ItemAnalysisReportManager.Warning.message=\u65B0\u3057\u3044\u5206\u6790\u3092\u
 AnalysisReportAccessDialog.shellTitle=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790
 AnalysisReportAccessDialog.generateSuccess=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790\u304C\u6B63\u3057\u304F\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002
 AnalysisReportAccessDialog.completeReportAvailable=\u30EC\u30DD\u30FC\u30C8\u3092\u30C1\u30A7\u30C3\u30AF
-AnalysisReportAccessDialog.accessBrowse=\u53C2\u7167...
+AnalysisReportAccessDialog.accessReport=\u3053\u3061\u3089
 AbstractPomTemplateProjectSettingPage.defaultTabLabel=\u30C7\u30D5\u30A9\u30EB\u30C8
 AbstractPomTemplateProjectSettingPage.customTabLabel=\u30AB\u30B9\u30BF\u30E0
 AbstractPomTemplateProjectSettingPage.previewButton=\u30D7\u30EC\u30D3\u30E5\u30FC

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_zh_CN.properties

@@ -492,8 +492,8 @@ EUpdateResult.Reload=\u91CD\u65B0\u52A0\u8F7D\u7EC4\u4EF6
 EUpdateResult.Rename=\u66F4\u6539\u540D\u79F0
 EUpdateResult.Add=\u4ECE\u5B58\u50A8\u5E93\u6DFB\u52A0
 EUpdateResult.Delete=\u4ECE\u5B58\u50A8\u5E93\u4E2D\u5220\u9664
-UpdatesConstants.ContextVariable=\u4E0A\u4E0B\u6587\u53D8\u91CF
-UpdatesConstants.ContextEnvironment=\u4E0A\u4E0B\u6587\u73AF\u5883
+UpdatesConstants.Context=\u4E0A\u4E0B\u6587
+UpdatesConstants.ContextGroup=\u4E0A\u4E0B\u6587\u7EC4
 UpdatesConstants.Component=\u7EC4\u4EF6
 UpdatesConstants.Joblet=Joblet
 UpdatesConstants.Spark_Joblet=Spark_Joblet
@@ -640,7 +640,7 @@ TalendLibsServerManager.cannotGetUserLibraryServer=\u65E0\u6CD5\u4ECE\u8FDC\u7A0
 MigrationReportAccessDialog.title=\u5DE5\u7A0B\u9879\u76EE\u8FC1\u79FB
 MigrationReportAccessDialog.migrateSuccess=\u5DE5\u7A0B\u9879\u76EE\u8FC1\u79FB\u6210\u529F\u3002
 MigrationReportAccessDialog.completeReportAvailable=\u8BF7\u68C0\u67E5\u62A5\u544A
-MigrationReportAccessDialog.accessBrowse=\u6D4F\u89C8...
+MigrationReportAccessDialog.accessReport=\u6B64\u5904
 MigrationReportAccessDialog.provideAnalysisTool=\u60A8\u73B0\u5728\u53EF\u4EE5\u8FD0\u884C\u5DE5\u7A0B\u5206\u6790\u4EE5\u5206\u6790\u8FC1\u79FB\u7684\u5DE5\u7A0B\u3002\u6B64\u5B9E\u9A8C\u6027\u5DE5\u5177\u5C06\u751F\u6210\u4E00\u4EFD\u5206\u6790\u62A5\u544A\uFF0C\u5176\u4E2D\u5305\u542B:
 MigrationReportAccessDialog.listOfProblems=- \u9700\u8981\u624B\u52A8\u4FEE\u590D\u7684\u9879\u76EE\u6E05\u5355\u3002
 MigrationReportAccessDialog.listItems=- \u9700\u8981\u68C0\u67E5\u7684\u9879\u76EE\u6E05\u5355\u3002
@@ -655,7 +655,7 @@ ItemAnalysisReportManager.Warning.message=\u73B0\u5728\u65E0\u6CD5\u8FD0\u884C\u
 AnalysisReportAccessDialog.shellTitle=\u5DE5\u7A0B\u5206\u6790
 AnalysisReportAccessDialog.generateSuccess=\u5DE5\u7A0B\u5206\u6790\u6210\u529F\u5B8C\u6210\u3002
 AnalysisReportAccessDialog.completeReportAvailable=\u8BF7\u68C0\u67E5\u62A5\u544A
-AnalysisReportAccessDialog.accessBrowse=\u6D4F\u89C8...
+AnalysisReportAccessDialog.accessReport=\u6B64\u5904
 AbstractPomTemplateProjectSettingPage.defaultTabLabel=\u9ED8\u8BA4
 AbstractPomTemplateProjectSettingPage.customTabLabel=\u81EA\u5B9A\u4E49
 AbstractPomTemplateProjectSettingPage.previewButton=\u9884\u89C8

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/services/IGenericDBService.java

@@ -19,7 +19,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.swt.widgets.Composite;
 import org.talend.components.api.properties.ComponentProperties;
-import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.builder.connection.Connection;
@@ -69,11 +68,4 @@ public interface IGenericDBService extends IService{
 
     public List<ERepositoryObjectType> getAllGenericMetadataDBRepositoryType();
 
-    public static IGenericDBService get() {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericDBService.class)) {
-            return GlobalServiceRegister.getDefault().getService(IGenericDBService.class);
-        }
-        return null;
-    }
-
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/services/IGenericService.java

@@ -14,9 +14,7 @@ package org.talend.core.runtime.services;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
-import org.talend.components.api.component.ComponentDefinition;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.components.IComponent;
@@ -66,10 +64,6 @@ public interface IGenericService extends IService {
 
     public void validateGenericConnection(Connection conn) throws Exception;
 
-    void mergeGenericNodes(RepositoryNode parent, String type);
-
-    Set<ComponentDefinition> getJDBCComponentDefinitions();
-
     public static IGenericService getService() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericService.class)) {
             return GlobalServiceRegister.getDefault().getService(IGenericService.class);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/services/IGenericWizardService.java

@@ -15,14 +15,10 @@ package org.talend.core.runtime.services;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbench;
 import org.talend.commons.ui.swt.actions.ITreeContextualAction;
 import org.talend.components.api.properties.ComponentProperties;
-import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.metadata.Dbms;
 import org.talend.core.model.metadata.IMetadataTable;
@@ -35,7 +31,6 @@ import org.talend.core.model.process.IElement;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.repository.ERepositoryObjectType;
-import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.repository.model.RepositoryNode;
 
 /**
@@ -157,17 +152,4 @@ public interface IGenericWizardService extends IService {
     public String getDatabseNameByNode(IElement node);
 
     public Dbms getDbms4AdditionalJDBC(String typeName);
-    
-    public IWizard newSchemaWizard(IWorkbench workbench, boolean creation, IRepositoryViewObject object,
-            MetadataTable metadataTable, String[] existingNames, boolean forceReadOnly);
-
-    void openGenericWizard(String type, boolean creation, IPath path, String[] existingNames);
-
-    public static IGenericWizardService get() {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
-            return GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
-        }
-        return null;
-    }
-    
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/util/ModuleAccessHelper.java

@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
@@ -149,7 +148,7 @@ public class ModuleAccessHelper {
         Set<JobInfo> allJobInfos = new HashSet<>();
         allJobInfos.add(new JobInfo(mainJobItem, mainJobItem.getProcess().getDefaultContext()));
         allJobInfos.addAll(processor.getBuildChildrenJobsAndJoblets());
-        return getModuleAccessVMArgs(property, allJobInfos);
+        return ModuleAccessHelper.getModuleAccessVMArgs(property, allJobInfos);
     }
 
     @SuppressWarnings("unchecked")
@@ -194,9 +193,6 @@ public class ModuleAccessHelper {
                                 .anyMatch(p -> ((ElementParameterType) p).getField() != null
                                         && EParameterFieldType.TECHNICAL.getName().equals(((ElementParameterType) p).getField())
                                         && ((ElementParameterType) p).getName().equals("TACOKIT_COMPONENT_ID")));
-                if (!hasTck) {
-                    hasTck = hasExtraSettings(parameters);
-                }
             }
         }
         if (hasTck) {
@@ -210,29 +206,6 @@ public class ModuleAccessHelper {
         return vmArgs;
     }
 
-    private static boolean hasExtraSettings(EList<ElementParameterType> parameters) {
-        if (parameters == null) {
-            return false;
-        }
-        Map<String, String> paramMap = parameters.stream().filter(p -> p.getName() != null && p.getValue() != null)
-                .collect(Collectors.toMap(ElementParameterType::getName, ElementParameterType::getValue, (a1, a2) -> a1));
-        // Implicit context
-        if (Boolean.valueOf(paramMap.getOrDefault("IMPLICIT_TCONTEXTLOAD", "false"))
-                && Boolean.valueOf(paramMap.getOrDefault("FROM_DATABASE_FLAG_IMPLICIT_CONTEXT", "false"))
-                && "JDBCInput".equals(paramMap.get("DB_TYPE_IMPLICIT_CONTEXT"))) {
-            return true;
-        }
-        // Stats&Logs
-        if ((Boolean.valueOf(paramMap.getOrDefault("ON_STATCATCHER_FLAG", "false"))
-                || Boolean.valueOf(paramMap.getOrDefault("ON_LOGCATCHER_FLAG", "false"))
-                || Boolean.valueOf(paramMap.getOrDefault("ON_METERCATCHER_FLAG", "false")))
-                && Boolean.valueOf(paramMap.getOrDefault("ON_DATABASE_FLAG", "false"))
-                && "JDBCOutput".equals(paramMap.get("DB_TYPE"))) {
-            return true;
-        }
-        return false;
-    }
-
     public static void reset() {
         PROPS = null;
     }
@@ -246,11 +219,6 @@ public class ModuleAccessHelper {
         if ("ID".equals(property.getId()) && "Mock_job_for_Guess_schema".equals(property.getLabel())) {
             return true;
         }
-        // TDQ-21668: only for fix generate ThresholdViolationAlert job failed
-        if (property.getLabel().startsWith("ThresholdViolationAlert")) { //$NON-NLS-1$
-            return true;
-        }
-        // TDQ-21668~
         Class<?> clazz = process.getClass();
         // preview process
         if (CLASS_PREVIEW_PROCESS.equals(clazz.getName()) || CLASS_PREVIEW_PROCESS.equals(clazz.getSuperclass().getName())) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/ICloudSignOnService.java

@@ -14,7 +14,6 @@ package org.talend.core.service;
 
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
-import org.talend.signon.util.PAT;
 import org.talend.signon.util.TokenMode;
 import org.talend.signon.util.listener.LoginEventListener;
 
@@ -54,21 +53,4 @@ public interface ICloudSignOnService extends IService {
         }
         return null;
     }
-    
-    /**
-     * Introspect PAT to retrieve the pat_created date and user info
-     * @param pat Personal access token of TMC
-     * @param dataCenter data center of TMC
-     * @return Introspected PAT
-     */
-    PAT introspectPAT(String pat, String dataCenter) throws Exception;
-    
-    /**
-     * Introspect pat and check whether pat is allowed
-     * 
-     * @param pat Personal access token
-     * @param tmcUrl tmc url
-     * @return valid or not
-     */
-    boolean validatePAT(String pat, String tmcUrl) throws Exception;
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IDetectCVEService.java

@@ -24,9 +24,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
-import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.ExceptionHandler;
-import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.Item;
@@ -90,13 +88,6 @@ public interface IDetectCVEService extends IService {
      */
     void clearCache();
 
-    public static IDetectCVEService get() {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IDetectCVEService.class)) {
-            return GlobalServiceRegister.getDefault().getService(IDetectCVEService.class);
-        }
-        return null;
-    }
-
     public static String mavenUri2GAV(String uri) {
         if (MavenUrlHelper.isMvnUrl(uri)) {
             MavenArtifact art = MavenUrlHelper.parseMvnUrl(uri);
@@ -1018,7 +1009,7 @@ public interface IDetectCVEService extends IService {
             this.version = ver;
         }
 
-        public Date parseVersion() {
+        private Date parseVersion() {
             String ver = version;
             if (ver != null) {
                 if (ver.startsWith("R")) {
@@ -1028,10 +1019,7 @@ public interface IDetectCVEService extends IService {
                 try {
                     return df.parse(ver);
                 } catch (ParseException e) {
-                    if (CommonsPlugin.isDebugMode()) {
-                        // avoid too much log
-                        ExceptionHandler.process(e);
-                    }
+                    ExceptionHandler.process(e);
                 }
             }
             return null;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IStudioLiteP2Service.java

@@ -149,10 +149,6 @@ public interface IStudioLiteP2Service extends IService {
     
     void cleanM2(IProgressMonitor monitor);
     
-    boolean isCompatibleUpdate() throws Exception;
-
-    String getCompatibleMessage() throws Exception;
-
     public static IStudioLiteP2Service get() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IStudioLiteP2Service.class)) {
             return GlobalServiceRegister.getDefault().getService(IStudioLiteP2Service.class);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/ITCKUIService.java

@@ -1,56 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2023 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.service;
-
-import java.util.function.BiFunction;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.graphics.Image;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.IService;
-import org.talend.core.model.components.IComponent;
-import org.talend.core.model.metadata.builder.connection.Connection;
-import org.talend.core.model.repository.ERepositoryObjectType;
-import org.talend.core.model.repository.IRepositoryViewObject;
-import org.talend.repository.model.RepositoryNode;
-
-public interface ITCKUIService extends IService {
-    
-    RepositoryNode createTaCoKitRepositoryNode(RepositoryNode parent, ERepositoryObjectType repObjType,
-            IRepositoryViewObject repositoryObject, Connection connection) throws Exception;
-
-    Image getTCKImage(Object element, BiFunction<Image, IRepositoryViewObject, Image> decorator);
-
-    boolean isTCKRepoistoryNode(RepositoryNode node);
-
-    ERepositoryObjectType getTCKRepositoryType(String componentName);
-
-    ERepositoryObjectType getTCKJDBCType();
-
-    Wizard createTCKWizard(String type, IPath path);
-
-    Wizard createTCKWizard(String type, IPath path, boolean isNew);
-
-    Wizard editTCKWizard(RepositoryNode node);
-       
-    String getComponentFamilyName(IComponent component);
-
-    public static ITCKUIService get() {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(ITCKUIService.class)) {
-            return GlobalServiceRegister.getDefault().getService(ITCKUIService.class);
-        }
-        return null;
-    }
-
-}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/sqlbuilder/util/ConnectionParameters.java

@@ -174,8 +174,6 @@ public class ConnectionParameters {
     private Map<String, String> parameters;
 
     private String selectContext = null;
-    
-    private boolean isTacokitJDBC = false;
 
     /**
      * Sets the connectionComment.
@@ -919,16 +917,4 @@ public class ConnectionParameters {
         this.selectContext = selectContext;
     }
 
-    
-    public boolean isTacokitJDBC() {
-        return isTacokitJDBC;
-    }
-
-    
-    public void setTacokitJDBC(boolean isTacokitJDBC) {
-        this.isTacokitJDBC = isTacokitJDBC;
-    }
-    
-    
-
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/utils/TalendQuoteUtils.java

@@ -453,6 +453,7 @@ public final class TalendQuoteUtils {
             return QUOTATION_MARK;
         case PSQL:
         case GREENPLUM:
+        case PLUSPSQL:
             return QUOTATION_MARK;
         case SYBASEASE:
             return QUOTATION_MARK;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/migration/MigrationReportAccessDialog.java

@@ -21,15 +21,13 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Shell;
 import org.talend.analysistask.ItemAnalysisReportManager;
 import org.talend.commons.exception.ExceptionHandler;
@@ -86,23 +84,11 @@ public class MigrationReportAccessDialog extends Dialog {
         migrationInfoLayout.marginLeft = 10;
         migrationInfoArea.setLayout(migrationInfoLayout);
         createMessageLabel(migrationInfoArea, Messages.getString("MigrationReportAccessDialog.migrateSuccess"));
-
-        Composite noteComp = new Composite(migrationInfoArea, SWT.NONE);
-        noteComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
-        noteComp.setLayout(new FormLayout());
-        Label noteLabel = new Label(noteComp, SWT.NONE);
-        noteLabel.setText(Messages.getString("MigrationReportAccessDialog.completeReportAvailable"));
-        FormData noteLabelFormData = new FormData();
-        noteLabelFormData.bottom = new FormAttachment(100, -5);
-        noteLabelFormData.left = new FormAttachment(0, 0);
-        noteLabel.setLayoutData(noteLabelFormData);
-        Button browseBtn = new Button(noteComp, SWT.NONE);
-        browseBtn.setText(Messages.getString("MigrationReportAccessDialog.accessBrowse"));
-        FormData linkFormData = new FormData();
-        linkFormData.top = new FormAttachment(0, 0);
-        linkFormData.left = new FormAttachment(noteLabel, 5);
-        browseBtn.setLayoutData(linkFormData);
-        browseBtn.addSelectionListener(new SelectionAdapter() {
+        Link accessLink = new Link(migrationInfoArea, SWT.NONE);
+        accessLink.setText(Messages.getString("MigrationReportAccessDialog.completeReportAvailable") + " <a>"
+                + Messages.getString("MigrationReportAccessDialog.accessReport") + "</a> .");
+        accessLink.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL));
+        accessLink.addSelectionListener(new SelectionAdapter() {
 
             @Override
             public void widgetSelected(SelectionEvent e) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNodeUtilities.java

@@ -262,9 +262,6 @@ public class RepositoryNodeUtilities {
         }
         RepositoryNode node = null;
         IRepositoryNode nodeFromType = view.getRoot().getRootRepositoryNode(curNode.getRepositoryObjectType());
-        if (curNode.getRepositoryObjectType() == ERepositoryObjectType.METADATA_TACOKIT_JDBC) {
-            nodeFromType = view.getRoot().getRootRepositoryNode(ERepositoryObjectType.METADATA_CONNECTIONS);
-        }
         if (nodeFromType != null) {
             node = getRepositoryNode(nodeFromType, curNode, view, expanded);
         }
@@ -499,7 +496,6 @@ public class RepositoryNodeUtilities {
                     || curType == ERepositoryObjectType.METADATA_CON_SYNONYM
                     || curType == ERepositoryObjectType.METADATA_CON_QUERY
                     || curType == ERepositoryObjectType.METADATA_CONNECTIONS
-                    || curType == ERepositoryObjectType.METADATA_TACOKIT_JDBC
                     || curType == ERepositoryObjectType.METADATA_FILE_DELIMITED
                     || curType == ERepositoryObjectType.METADATA_FILE_POSITIONAL
                     || curType == ERepositoryObjectType.METADATA_FILE_REGEXP
@@ -526,13 +522,12 @@ public class RepositoryNodeUtilities {
                 tmpType = ERepositoryObjectType.DOCUMENTATION;
             }
 
-            if (tmpType != null && (tmpType == rootContextType || rootContextType.isChildTypeOf(tmpType))) {
+            if (tmpType != null && tmpType == rootContextType) {
                 expandParentNode(view, rootNode);
             }
             // expand the parent node
 
-            if ((curType == rootContextType || curType.isChildTypeOf(rootContextType))
-                    && isRepositoryFolder(rootNode)) {
+            if (curType == rootContextType && isRepositoryFolder(rootNode)) {
                 if (rootContextType == ERepositoryObjectType.SQLPATTERNS
                         && !(rootNode.getParent() instanceof IProjectRepositoryNode)) {
                     // sql pattern
@@ -720,7 +715,7 @@ public class RepositoryNodeUtilities {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
             wizardService = GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
         }
-        if (wizardService != null && wizardService.isGenericType(type) || ERepositoryObjectType.METADATA_TACOKIT_JDBC == type) {
+        if (wizardService != null && wizardService.isGenericType(type)) {
             return getGenericSchemaNode(connection, tableName);
         }
         if (repType == ERepositoryObjectType.METADATA_CON_QUERY) {

main/plugins/org.talend.core.ui/src/main/java/messages_fr.properties

@@ -586,11 +586,3 @@ I18nPreferencePage.wait_process=Le processus va prendre plusieurs minutes, patie
 MetadataPreferencePage.EnableBasic.name=Autorise l'en-t\u00EAte d'authentification basique
 MetadataPreferencePage.MessageDialog.Restart=Le Studio doit red\u00E9marrer pour que ce param\u00E8tre soit pris en compte.\nContinuer malgr\u00E9 tout ?
 TalendTabbedPropertyTitle.componentHelpTooltip=Ouvrir l'aide en ligne
-Java17NotificationPopup.title=Compatibilit\u00E9 avec Java 17
-Java17NotificationPopup.info=Activez la compatibilit\u00E9 avec Java 17 pour tirer parti de votre Studio au maximum.\n<a>Ouvrir les param\u00E8tres du projet</a>
-CapabilityCheckDialog.title=Compatibilit\u00E9 avec le moteur d'ex\u00E9cution
-CapabilityCheckDialog.message=Avant de publier, assurez-vous que votre moteur d'ex\u00E9cution utilise Java 11 ou une version sup\u00E9rieure.
-CapabilityCheckDialog.link=<a>En savoir plus</a>
-CapabilityCheckDialog.toggle=Ne plus afficher ce message
-CapabilityCheckDialog.cancel=Annuler
-CapabilityCheckDialog.publish=Publier quand m\u00EAme

main/plugins/org.talend.core.ui/src/main/java/messages_ja.properties

@@ -586,11 +586,3 @@ I18nPreferencePage.wait_process=\u3053\u306E\u51E6\u7406\u306B\u306F\u6570\u5206
 MetadataPreferencePage.EnableBasic.name=\u57FA\u672C\u8A8D\u8A3C\u30D8\u30C3\u30C0\u30FC\u3092\u6709\u52B9\u5316
 MetadataPreferencePage.MessageDialog.Restart=\u3053\u306E\u8A2D\u5B9A\u304C\u6709\u52B9\u306B\u306A\u308B\u3088\u3046\u3001Studio\u3092\u518D\u8D77\u52D5\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u7D9A\u884C\u3057\u307E\u3059\u304B?
 TalendTabbedPropertyTitle.componentHelpTooltip=\u30AA\u30F3\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u3092\u958B\u304F
-Java17NotificationPopup.title=Java 17\u3068\u306E\u4E92\u63DB\u6027
-Java17NotificationPopup.info=Java 17\u3068\u306E\u4E92\u63DB\u6027\u3092\u6709\u52B9\u306B\u3057\u3066Studio\u3092\u6700\u5927\u9650\u306B\u6D3B\u7528\u3057\u307E\u3057\u3087\u3046\u3002\n<a>\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u8A2D\u5B9A\u3092\u958B\u304F</a>
-CapabilityCheckDialog.title=\u30E9\u30F3\u30BF\u30A4\u30E0\u306E\u4E92\u63DB\u6027
-CapabilityCheckDialog.message=\u516C\u958B\u3059\u308B\u524D\u306B\u3001\u30E9\u30F3\u30BF\u30A4\u30E0\u304CJava 11\u4EE5\u964D\u3067\u3042\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-CapabilityCheckDialog.link=<a>\u8A73\u7D30</a>
-CapabilityCheckDialog.toggle=\u6B21\u56DE\u304B\u3089\u3053\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3057\u306A\u3044
-CapabilityCheckDialog.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
-CapabilityCheckDialog.publish=\u516C\u958B\u3059\u308B

main/plugins/org.talend.core.ui/src/main/java/messages_zh_CN.properties

@@ -586,11 +586,3 @@ I18nPreferencePage.wait_process=\u8FD9\u4E2A\u8FC7\u7A0B\u5C06\u6301\u7EED\u51E0
 MetadataPreferencePage.EnableBasic.name=\u542F\u7528\u57FA\u672C\u8EAB\u4EFD\u9A8C\u8BC1\u6807\u5934
 MetadataPreferencePage.MessageDialog.Restart=\u6B64\u8BBE\u7F6E\u5C06\u5728 Studio \u91CD\u542F\u540E\u751F\u6548\u3002\n\u662F\u5426\u786E\u5B9A\uFF1F
 TalendTabbedPropertyTitle.componentHelpTooltip=\u6253\u5F00\u5728\u7EBF\u5E2E\u52A9
-Java17NotificationPopup.title=Java 17 \u517C\u5BB9\u6027
-Java17NotificationPopup.info=\u542F\u7528 Java 17 \u517C\u5BB9\u6027\u4EE5\u5145\u5206\u5229\u7528\u60A8\u7684 Studio\u3002\n<a>\u6253\u5F00\u5DE5\u7A0B\u8BBE\u7F6E</a>
-CapabilityCheckDialog.title=\u8FD0\u884C\u65F6\u517C\u5BB9\u6027
-CapabilityCheckDialog.message=\u53D1\u5E03\u4E4B\u524D\uFF0C\u786E\u4FDD\u8FD0\u884C\u65F6\u4F7F\u7528\u7684\u662F Java 11 \u6216\u66F4\u9AD8\u7248\u672C\u3002
-CapabilityCheckDialog.link=<a>\u4E86\u89E3\u66F4\u591A</a>
-CapabilityCheckDialog.toggle=\u4E0D\u518D\u663E\u793A\u6B64\u6D88\u606F
-CapabilityCheckDialog.cancel=\u53D6\u6D88
-CapabilityCheckDialog.publish=\u4ECD\u7136\u53D1\u5E03

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextNebulaGridComposite.java

@@ -108,8 +108,6 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
 
     private Button manageEnvironmentsButton;
 
-    private Button wrapButton;
-
     private ContextManagerHelper helper;
 
     private List<Button> buttonList;
@@ -231,11 +229,8 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
     }
 
     private void createButtonsGroup(Composite parentComposite) {
-        boolean isRepositoryContext = (modelManager instanceof ContextComposite)
-                && ((ContextComposite) modelManager).isRepositoryContext();
-        int columnNum = isRepositoryContext ? 5 : 7;
         buttonsComp = new Composite(parentComposite, SWT.NULL);
-        buttonsComp.setLayout(GridLayoutFactory.swtDefaults().spacing(10, 0).margins(5, 0).numColumns(columnNum).create());
+        buttonsComp.setLayout(GridLayoutFactory.swtDefaults().spacing(5, 0).margins(5, 0).numColumns(7).create());
         GridDataFactory.swtDefaults().align(SWT.FILL, SWT.DOWN).grab(true, false).applyTo(buttonsComp);
         buttonList.clear();
         addButton = createAddPushButton(buttonsComp);
@@ -243,6 +238,8 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
         removeButton = createRemovePushButton(buttonsComp);
         buttonList.add(removeButton);
 
+        boolean isRepositoryContext = (modelManager instanceof ContextComposite)
+                && ((ContextComposite) modelManager).isRepositoryContext();
         if (!isRepositoryContext) {// for bug 7393
             moveUpButton = createMoveUpPushButton(buttonsComp);
             buttonList.add(moveUpButton);
@@ -256,16 +253,14 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
         }
 
         createEnvironmentsGroup(buttonsComp);
-        wrapButton = createWrapButton(buttonsComp);
     }
 
     private void createEnvironmentsGroup(Composite parentComposite) {
         Composite environmentsComp = new Composite(parentComposite, SWT.NULL);
-        GridLayout gridLayout = new GridLayout(2, false);
-        gridLayout.horizontalSpacing = 10;
-        environmentsComp.setLayout(gridLayout);
+        environmentsComp.setLayout(new GridLayout(2, false));
         GridData contextComboData = new GridData();
         contextComboData.grabExcessHorizontalSpace = true;
+        contextComboData.horizontalAlignment = GridData.END;
         environmentsComp.setLayoutData(contextComboData);
 
         viewEnvironmentsCombo = new CCombo(environmentsComp, SWT.BORDER);
@@ -552,35 +547,6 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
         return selectContextVariablesPushButton;
     }
 
-    private Button createWrapButton(final Composite parent) {
-        Button wrapToggleButton = new Button(parent, SWT.TOGGLE);
-        wrapToggleButton.setBackground(parent.getBackground());
-        GridData gridData = new GridData();
-        gridData.grabExcessHorizontalSpace = true;
-        gridData.horizontalAlignment = GridData.END;
-        Image image = ImageProvider.getImage(EImage.WRAP_ICON);
-        IContextManager contextManager = getContextManager();
-        if (contextManager instanceof JobContextManager) {
-            JobContextManager jobContextManager = (JobContextManager) contextManager;
-            wrapToggleButton.setSelection(jobContextManager.isWrapContextText());
-        }
-        wrapToggleButton.setImage(image);
-        wrapToggleButton.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                IContextManager contextManager = getContextManager();
-                if (contextManager instanceof JobContextManager) {
-                    JobContextManager jobContextManager = (JobContextManager) contextManager;
-                    jobContextManager.setWrapContextText(wrapToggleButton.getSelection());
-                }
-                refresh();
-            }
-
-        });
-        return wrapToggleButton;
-    }
-
     private void setButtonEnableState() {
         boolean enableState = !modelManager.isReadOnly();
         if (this.addButton != null) {
@@ -604,13 +570,6 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
         if (contextsCombo != null) {
             this.contextsCombo.setEnabled(enableState);
         }
-        if (wrapButton != null) {
-            IContextManager contextManager = getContextManager();
-            if (contextManager instanceof JobContextManager) {
-                JobContextManager jobContextManager = (JobContextManager) contextManager;
-                wrapButton.setSelection(jobContextManager.isWrapContextText());
-            }
-        }
     }
 
     public Object createNewEntry() {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextTreeTable.java

@@ -20,7 +20,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
@@ -35,7 +34,6 @@ import org.eclipse.nebula.widgets.nattable.config.DefaultComparator;
 import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
 import org.eclipse.nebula.widgets.nattable.data.IColumnPropertyAccessor;
 import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
-import org.eclipse.nebula.widgets.nattable.edit.event.DataUpdateEvent;
 import org.eclipse.nebula.widgets.nattable.extension.glazedlists.DetailGlazedListsEventLayer;
 import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsDataProvider;
 import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsSortModel;
@@ -58,18 +56,10 @@ import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel.ColumnGroup;
 import org.eclipse.nebula.widgets.nattable.group.ColumnGroupReorderLayer;
 import org.eclipse.nebula.widgets.nattable.hideshow.ColumnHideShowLayer;
 import org.eclipse.nebula.widgets.nattable.hideshow.RowHideShowLayer;
-import org.eclipse.nebula.widgets.nattable.layer.AbstractIndexLayerTransform;
-import org.eclipse.nebula.widgets.nattable.layer.AbstractLayerTransform;
 import org.eclipse.nebula.widgets.nattable.layer.DataLayer;
-import org.eclipse.nebula.widgets.nattable.layer.ILayer;
-import org.eclipse.nebula.widgets.nattable.layer.ILayerListener;
 import org.eclipse.nebula.widgets.nattable.layer.cell.ColumnOverrideLabelAccumulator;
 import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
 import org.eclipse.nebula.widgets.nattable.layer.config.DefaultColumnHeaderStyleConfiguration;
-import org.eclipse.nebula.widgets.nattable.layer.event.ILayerEvent;
-import org.eclipse.nebula.widgets.nattable.layer.event.RowDeleteEvent;
-import org.eclipse.nebula.widgets.nattable.layer.event.RowInsertEvent;
-import org.eclipse.nebula.widgets.nattable.layer.event.RowStructuralChangeEvent;
 import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
 import org.eclipse.nebula.widgets.nattable.painter.layer.NatGridLayerPainter;
 import org.eclipse.nebula.widgets.nattable.reorder.ColumnReorderLayer;
@@ -102,9 +92,7 @@ import org.eclipse.swt.widgets.Event;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.runtime.ColorConstants;
 import org.talend.core.GlobalServiceRegister;
-import org.talend.core.model.context.JobContextManager;
 import org.talend.core.model.process.IContext;
-import org.talend.core.model.process.IContextManager;
 import org.talend.core.model.process.IContextParameter;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
@@ -161,10 +149,6 @@ public class ContextTreeTable {
 
     private final static int fixedTypeWidth = 100;
 
-    private final static int minDefultHeight = 20;
-
-    private final static int maxDefaultWidth = 400;
-
     public ContextTreeTable(IContextModelManager manager) {
         this.manager = manager;
     }
@@ -437,101 +421,6 @@ public class ContextTreeTable {
                 currentNatTabSel = (IStructuredSelection) event.getSelection();
             }
         });
-
-        this.natTable.addLayerListener(new ILayerListener() {
-
-            @Override
-            public void handleLayerEvent(ILayerEvent event) {
-                // DataUpdateEvent->Data change, RowInsertEvent->node expand, RowDeleteEvent->node collapse
-                if (event instanceof DataUpdateEvent) {
-                    // data changed then execute here no need compare value
-                    DataUpdateEvent dataEvent = (DataUpdateEvent) event;
-                    ILayer layer = dataEvent.getLayer();
-                    DataLayer dataLayer = getDataLayer(layer);
-                    if (dataLayer == null) {
-                        return;
-                    }
-                    int rowPosition = dataEvent.getRowPosition();
-                    int columnPosition = dataEvent.getColumnPosition();
-                    if (layer instanceof GridLayer) {
-                        GridLayer gridLayer = (GridLayer) layer;
-                        rowPosition = rowPosition - gridLayer.getColumnHeaderLayer().getRowCount();
-                        columnPosition = columnPosition - gridLayer.getRowHeaderLayer().getColumnCount();
-                    }
-                    String text = dataEvent.getNewValue() == null ? "" : dataEvent.getNewValue().toString();
-                    GC gc = new GCFactory(natTable).createGC();
-                    Point point = gc.textExtent(text, SWT.DRAW_MNEMONIC);
-                    int textLength = point.x;
-                    int currentColumnWidth = layer.getColumnWidthByPosition(columnPosition);
-                    if (textLength > layer.getColumnWidthByPosition(columnPosition)) {
-                        if (textLength > maxDefaultWidth) {
-                            int columnWidth = Math.max(currentColumnWidth, maxDefaultWidth);
-                            dataLayer.setColumnWidthByPosition(columnPosition, columnWidth);
-                        } else {
-                            int columnWidth = getColumWidth(gc, dataLayer, columnPosition);
-                            dataLayer.setColumnWidthByPosition(columnPosition, columnWidth);
-                        }
-                    }
-                    int promptColPos = dataLayer.getColumnPositionByIndex(3);
-                    IContextManager contextManager = manager.getContextManager();
-                    if (contextManager instanceof JobContextManager) {
-                        JobContextManager jobContextManager = (JobContextManager) contextManager;
-                        if (jobContextManager.isWrapContextText()) {
-                            int rowHeight = getRowHeight(gc, dataLayer, rowPosition, promptColPos);
-                            dataLayer.setRowHeightByPosition(rowPosition, rowHeight);
-                        }
-                    }
-                    gc.dispose();
-                } else if (event instanceof RowInsertEvent || event instanceof RowDeleteEvent) {
-                    RowStructuralChangeEvent changeEvent = (RowStructuralChangeEvent) event;
-                    ILayer layer = changeEvent.getLayer();
-                    DataLayer dataLayer = getDataLayer(layer);
-                    List<Integer> checkPos = new ArrayList<Integer>();
-                    checkPos.add(3);
-                    adjustCellWidthHeight(dataLayer, checkPos);
-                }
-
-            }
-        });
-    }
-
-    private DataLayer getDataLayer(ILayer layer) {
-        DataLayer dataLayer = null;
-        if (layer instanceof GridLayer) {
-            GridLayer gridLayer = (GridLayer) layer;
-            ILayer bodyLayer = gridLayer.getBodyLayer();
-            if (bodyLayer instanceof AbstractLayerTransform) {
-                AbstractLayerTransform childLayer = (AbstractLayerTransform) bodyLayer;
-                dataLayer = findDataLayerByUnderlyingLayer(childLayer);
-            }
-        } else if (layer instanceof DataLayer) {
-            dataLayer = (DataLayer) layer;
-        } else if (layer instanceof AbstractLayerTransform || layer instanceof AbstractIndexLayerTransform) {
-            dataLayer = findDataLayerByUnderlyingLayer(layer);
-        }
-        return dataLayer;
-    }
-
-    private DataLayer findDataLayerByUnderlyingLayer(ILayer layer) {
-        // only 1 underlyingLayer set on AbstractLayerTransform / AbstractIndexLayerTransform
-        ILayer underlyingLayer = null;
-        if (layer instanceof AbstractLayerTransform) {
-            AbstractLayerTransform layerTransform = (AbstractLayerTransform) layer;
-            underlyingLayer = layerTransform.getUnderlyingLayerByPosition(0, 0);
-        } else if (layer instanceof AbstractIndexLayerTransform) {
-            AbstractIndexLayerTransform layerTransform = (AbstractIndexLayerTransform) layer;
-            underlyingLayer = layerTransform.getUnderlyingLayerByPosition(0, 0);
-        }
-        if (underlyingLayer instanceof DataLayer) {
-            return (DataLayer) underlyingLayer;
-        } else if (underlyingLayer instanceof AbstractLayerTransform) {
-            AbstractLayerTransform childLayer = (AbstractLayerTransform) underlyingLayer;
-            return findDataLayerByUnderlyingLayer(childLayer);
-        } else if (underlyingLayer instanceof AbstractIndexLayerTransform) {
-            AbstractIndexLayerTransform childLayer = (AbstractIndexLayerTransform) underlyingLayer;
-            return findDataLayerByUnderlyingLayer(childLayer);
-        }
-        return null;
     }
 
     private List<Integer> getAllCheckPosBehaviour(IContextModelManager manager, ColumnGroupModel contextGroupModel) {
@@ -559,108 +448,58 @@ public class ContextTreeTable {
                 dataLayer.setColumnWidthByPosition(i, averageWidth);
             }
         } else {
-            adjustCellWidthHeight(dataLayer, checkColumnsPos);
-        }
-    }
+            int typeColumnPos = dataLayer.getColumnPositionByIndex(1);
 
-    private void adjustCellWidthHeight(DataLayer dataLayer, List<Integer> checkColumnsPos) {
-        int typeColumnPos = dataLayer.getColumnPositionByIndex(1);
-        GC gc = new GCFactory(natTable).createGC();
-        for (int i = 0; i < dataLayer.getColumnCount(); i++) {
-            boolean findCheck = false;
-            boolean findType = false;
-            if (typeColumnPos == i) {
-                findType = true;
-                dataLayer.setColumnWidthByPosition(i, fixedTypeWidth);
-            }
-            for (int checkPos : checkColumnsPos) {
-                if (checkPos == i) {
-                    findCheck = true;
-                    dataLayer.setColumnWidthByPosition(i, fixedCheckBoxWidth);
+            int leftWidth = maxWidth - fixedTypeWidth - fixedCheckBoxWidth * checkColumnsPos.size() - cornerWidth * 2;
+
+            int currentColumnsCount = dataColumnsCount - checkColumnsPos.size() - 1;
+            int averageWidth = leftWidth / currentColumnsCount;
+            for (int i = 0; i < dataLayer.getColumnCount(); i++) {
+                boolean findHide = false;
+                boolean findCheck = false;
+                boolean findType = false;
+                if (typeColumnPos == i) {
+                    findType = true;
+                    dataLayer.setColumnWidthByPosition(i, fixedTypeWidth);
                 }
-            }
-            if (!findCheck && !findType) {
-                int colW = getColumWidth(gc, dataLayer, i);
-                dataLayer.setColumnWidthByPosition(i, colW);
-            }
-        }
-        // setColumnWidthByPosition final scaled by DPI, set height according final width
-        int promptColPos = dataLayer.getColumnPositionByIndex(3);
-        IContextManager contextManager = manager.getContextManager();
-        if (contextManager instanceof JobContextManager) {
-            JobContextManager jobContextManager = (JobContextManager) contextManager;
-            if (jobContextManager.isWrapContextText()) {
-                for (int i = 0; i < dataLayer.getPreferredRowCount(); i++) {
-                    int rowHeight = getRowHeight(gc, dataLayer, i, promptColPos);
-                    dataLayer.setRowHeightByPosition(i, rowHeight);
+                for (int checkPos : checkColumnsPos) {
+                    if (checkPos == i) {
+                        findCheck = true;
+                        dataLayer.setColumnWidthByPosition(i, fixedCheckBoxWidth);
+                    }
+                }
+                if (!findHide && !findCheck && !findType) {
+                    int colW = getColumWidth(dataLayer, i, averageWidth);
+                    dataLayer.setColumnWidthByPosition(i, colW);
                 }
             }
         }
-        gc.dispose();
     }
 
-    private int getColumWidth(GC gc, DataLayer dataLayer, int colPos) {
+    private int getColumWidth(DataLayer dataLayer, int colPos, int avgWidth) {
         int colWidth = fixedTypeWidth;
+        GC gc = new GCFactory(natTable).createGC();
         int max = 0;
         String text = "";
         for (int i = 0; i < dataLayer.getPreferredRowCount(); i++) {
             Object dataValueByPosition = dataLayer.getDataValueByPosition(colPos, i);
-            if (dataValueByPosition == null || StringUtils.isBlank(dataValueByPosition.toString())) {
+            if (dataValueByPosition == null) {
                 continue;
             }
             text = dataValueByPosition.toString();
             Point size = gc.textExtent(text, SWT.DRAW_MNEMONIC);
-            int textWidth = size.x;
-            if (textWidth > max) {
-                max = textWidth;
+            int temp = size.x;
+            if (temp > max) {
+                max = temp;
             }
         }
+        gc.dispose();
         if (max > colWidth) {
             max = (int) (max - text.getBytes().length * 1.5);
-            if (max > maxDefaultWidth) {
-                max = maxDefaultWidth;
-            }
         }
         return colWidth > max ? colWidth : max;
     }
 
-    private int getRowHeight(GC gc, DataLayer dataLayer, int rowPos, int promptColPos) {
-        int maxHeight = minDefultHeight;
-        for (int j = 0; j < dataLayer.getColumnCount(); j++) {
-            // only check value column height
-            if (j <= promptColPos) {
-                continue;
-            }
-            Object dataValueByPosition = dataLayer.getDataValueByPosition(j, rowPos);
-            if (dataValueByPosition == null || StringUtils.isBlank(dataValueByPosition.toString())) {
-                continue;
-            }
-            String text = dataValueByPosition.toString();
-            Point size = gc.textExtent(text, SWT.DRAW_MNEMONIC);
-            int textWidth = size.x;
-            int textHeight = size.y;
-            String[] lines = text.split(TextPainter.NEW_LINE_REGEX);
-            int columnWidth = dataLayer.getColumnWidthByPosition(j);
-            if (textWidth >= columnWidth || lines.length > 1) {
-                int heightCount = 0;
-                for (String line : lines) {
-                    int lineWidth = gc.textExtent(line).x;
-                    if (lineWidth < columnWidth) {
-                        heightCount++;
-                    } else {
-                        heightCount += lineWidth / columnWidth;
-                        heightCount += lineWidth % columnWidth == 0 ? 0 : 1;
-                    }
-                }
-                int cellheight = textHeight * heightCount;
-                maxHeight = Math.max(maxHeight, dataLayer.downScaleRowHeight(cellheight));
-            } else {
-                maxHeight = Math.max(maxHeight, textHeight);
-            }
-        }
-        return maxHeight;
-    }
-
     private void addCustomSelectionBehaviour(SelectionLayer layer) {
         // need control the selection style when select the rows.
         DefaultSelectionStyleConfiguration selectStyleConfig = new DefaultSelectionStyleConfiguration();

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/StringTextDialog.java

@@ -1,84 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2023 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.ui.context;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.talend.commons.ui.runtime.ITalendThemeService;
-import org.talend.commons.ui.swt.colorstyledtext.ColorStyledText;
-
-/**
- * DOC jding  class global comment. Detailled comment
- */
-public class StringTextDialog extends Dialog {
-
-    private String content;
-
-    private Text text;
-
-    public StringTextDialog(Shell parentShell) {
-        super(parentShell);
-    }
-
-    public StringTextDialog(Shell parentShell, String content) {
-        super(parentShell);
-        this.content = content;
-    }
-
-    @Override
-    protected boolean isResizable() {
-        return true;
-    }
-
-    @Override
-    protected void configureShell(Shell shell) {
-        super.configureShell(shell);
-        shell.setText("Enter the value");
-    }
-
-    @Override
-    protected Control createDialogArea(Composite parent) {
-        Composite composite = new Composite(parent, SWT.NONE);
-        GridData gd = new GridData(GridData.FILL_BOTH);
-        gd.widthHint = 640;
-        gd.heightHint = 260;
-        composite.setLayoutData(gd);
-        composite.setLayout(new GridLayout());
-        text = new Text(composite, SWT.WRAP | SWT.BORDER | SWT.MULTI | SWT.V_SCROLL | SWT.LEFT);
-        text.setForeground(ITalendThemeService.getColor(ColorStyledText.PREFERENCE_COLOR_FOREGROUND).orElse(null));
-        text.setBackground(ITalendThemeService.getColor(ColorStyledText.PREFERENCE_COLOR_BACKGROUND).orElse(null));
-        text.setLayoutData(new GridData(GridData.FILL_BOTH));
-        text.setText(content);
-        text.addModifyListener(new ModifyListener() {
-
-            @Override
-            public void modifyText(ModifyEvent e) {
-                content = text.getText();
-            }
-        });
-        return composite;
-    }
-
-    public String getTextContent() {
-        return content;
-    }
-
-}

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableConfiguration.java

@@ -37,9 +37,7 @@ import org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter;
 import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
 import org.eclipse.nebula.widgets.nattable.style.CellStyleUtil;
 import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
-import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;
 import org.eclipse.nebula.widgets.nattable.style.Style;
-import org.eclipse.nebula.widgets.nattable.style.VerticalAlignmentEnum;
 import org.eclipse.nebula.widgets.nattable.ui.util.CellEdgeEnum;
 import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
 import org.eclipse.swt.graphics.Color;
@@ -130,11 +128,7 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleDefault, DisplayMode.NORMAL,
                 ContextTableConstants.COLUMN_CHECK_PROPERTY);
 
-        Style valueCellStyleDefault = new Style();
-        valueCellStyleDefault.setAttributeValue(CellStyleAttributes.BACKGROUND_COLOR, ColorConstants.getTableBackgroundColor());
-        valueCellStyleDefault.setAttributeValue(CellStyleAttributes.HORIZONTAL_ALIGNMENT, HorizontalAlignmentEnum.LEFT);
-        valueCellStyleDefault.setAttributeValue(CellStyleAttributes.VERTICAL_ALIGNMENT, VerticalAlignmentEnum.TOP);
-        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, valueCellStyleDefault, DisplayMode.NORMAL,
+        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleDefault, DisplayMode.NORMAL,
                 ContextTableConstants.COLUMN_CONTEXT_VALUE);
 
         Style cellStyleSelect = new Style();
@@ -152,10 +146,6 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleSelect, DisplayMode.SELECT,
                 ContextTableConstants.COLUMN_CHECK_PROPERTY);
 
-        Style valueCellStyleSelect = new Style();
-        valueCellStyleSelect.setAttributeValue(CellStyleAttributes.BACKGROUND_COLOR, GUIHelper.COLOR_TITLE_INACTIVE_BACKGROUND);
-        valueCellStyleSelect.setAttributeValue(CellStyleAttributes.FONT, GUIHelper.DEFAULT_FONT);
-        valueCellStyleSelect.setAttributeValue(CellStyleAttributes.HORIZONTAL_ALIGNMENT, HorizontalAlignmentEnum.LEFT);
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleSelect, DisplayMode.SELECT,
                 ContextTableConstants.COLUMN_CONTEXT_VALUE);
     }
@@ -327,13 +317,6 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
         ProxyDynamicCellEditor cutomCellEditor = new ProxyDynamicCellEditor(dataProvider, manager, modelManager);
         configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, cutomCellEditor, DisplayMode.EDIT,
                 ContextTableConstants.COLUMN_CONTEXT_VALUE);
-        ContextAutoResizeTextPainter customPainter = new ContextAutoResizeTextPainter(true, false, false);
-        customPainter.setWordWrapping(true);
-        ContextNatTableBackGroudPainter backGroudPainter = new ContextNatTableBackGroudPainter(customPainter, dataProvider);
-        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, backGroudPainter, DisplayMode.NORMAL,
-                ContextTableConstants.COLUMN_CONTEXT_VALUE);
-        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, backGroudPainter, DisplayMode.SELECT,
-                ContextTableConstants.COLUMN_CONTEXT_VALUE);
     }
 
     private void registerColumnFiveTextEditor(IConfigRegistry configRegistry) {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextValueLabelAccumulator.java

@@ -48,9 +48,6 @@ public class ContextValueLabelAccumulator extends ColumnOverrideLabelAccumulator
     public void accumulateConfigLabels(LabelStack configLabels, int columnPosition, int rowPosition) {
         super.accumulateConfigLabels(configLabels, columnPosition, rowPosition);
         boolean isAddedValueNotMatchStyle = false;
-        if (modelManager.getProcess() == null) {
-            return;
-        }
         String currentColumnName = ContextRowDataListFixture.getPropertyNamesAsList(modelManager).get(columnPosition);
         ContextTreeNode rowNode = ((GlazedListsDataProvider<ContextTreeNode>) dataProvider).getList().get(rowPosition);
         if (configLabels.contains(ContextTableConstants.COLUMN_CONTEXT_VALUE)) {
@@ -65,7 +62,7 @@ public class ContextValueLabelAccumulator extends ColumnOverrideLabelAccumulator
                 }
             }
         }
-        
+        
         if (!isAddedValueNotMatchStyle) {
             if (rowNode.getTreeData() instanceof ContextTableTabParentModel) {
                 ContextTableTabParentModel rowModel = (ContextTableTabParentModel) rowNode.getTreeData();

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextValuesNatText.java

@@ -15,7 +15,6 @@ package org.talend.core.ui.context.nattableTree;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
 import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
 import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;
 import org.eclipse.nebula.widgets.nattable.style.IStyle;
@@ -110,12 +109,9 @@ public class ContextValuesNatText extends Composite {
         if (NatTableCellEditorFactory.isPassword(realPara.getType())) {
             widgetStyle = SWT.PASSWORD | HorizontalAlignmentEnum.getSWTStyle(cellStyle);
         }
-        if (NatTableCellEditorFactory.isResource(realPara.getType()) || NatTableCellEditorFactory.isList(realPara.getType())) {
+        if (NatTableCellEditorFactory.isResource(realPara.getType())) {
             widgetStyle = SWT.READ_ONLY | HorizontalAlignmentEnum.getSWTStyle(cellStyle);
         }
-        if (NatTableCellEditorFactory.isString(realPara.getType())) {
-            widgetStyle = widgetStyle | SWT.WRAP | SWT.MULTI | SWT.V_SCROLL;
-        }
         text = new Text(this, widgetStyle);
         text.setBackground(cellStyle.getAttributeValue(CellStyleAttributes.BACKGROUND_COLOR));
         text.setForeground(cellStyle.getAttributeValue(CellStyleAttributes.FOREGROUND_COLOR));
@@ -239,7 +235,6 @@ public class ContextValuesNatText extends Composite {
      */
     protected String getTransformedSelection(boolean focusOnText) {
         Object result = null;
-        validateValue();
         result = cellFactory.openCustomCellEditor(realPara, getShell());
         String finalResult = "";
         if (result == null || result.equals("")) {
@@ -256,14 +251,6 @@ public class ContextValuesNatText extends Composite {
         return finalResult;
     }
 
-    private void validateValue() {
-        // possible value modified manually
-        // notify focuslost to commit value might execute after dialog open in some os
-        if (NatTableCellEditorFactory.isString(realPara.getType()) && !StringUtils.equals(realPara.getValue(), text.getText())) {
-            realPara.setValue(text.getText());
-        }
-    }
-
     protected String getTransformedTextForDialog(boolean focusOnText) {
         String result = "";
         result = getTransformedSelection(focusOnText);

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/CustomTextCellEditor.java

@@ -25,8 +25,6 @@ import org.eclipse.nebula.widgets.nattable.style.Style;
 import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
 import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.widgets.Composite;
@@ -80,33 +78,6 @@ public class CustomTextCellEditor extends AbstractCellEditor {
         this.cellStyle = cellStyle;
         this.commitOnUpDown = commitOnUpDown;
         this.moveSelectionOnEnter = moveSelectionOnEnter;
-        this.focusListener = new FocusAdapter() {
-
-            @Override
-            public void focusLost(FocusEvent e) {
-                // overwrite org.eclipse.nebula.widgets.nattable.edit.editor.AbstractCellEditor.InlineFocusListener
-                // set closeAfterCommit to false
-                if (!commit(MoveDirectionEnum.NONE, false)) {
-                    if (!e.widget.isDisposed() && e.widget instanceof Control) {
-                        ((Control) e.widget).forceFocus();
-                    }
-                } else {
-                    if (!CustomTextCellEditor.this.parent.isDisposed()) {
-                        CustomTextCellEditor.this.parent.forceFocus();
-                    }
-                }
-            }
-
-        };
-    }
-
-    @Override
-    public void addEditorControlListeners() {
-        Control editorControl = getEditorControl();
-        if (editorControl != null && !editorControl.isDisposed() && this.editMode == EditModeEnum.INLINE) {
-            editorControl.addFocusListener(this.focusListener);
-            editorControl.addTraverseListener(this.traverseListener);
-        }
     }
 
     /*

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/NatTableCellEditorFactory.java

@@ -27,7 +27,6 @@ import org.talend.core.model.metadata.types.JavaTypesManager;
 import org.talend.core.model.process.IContextParameter;
 import org.talend.core.service.IResourcesDependenciesService;
 import org.talend.core.ui.context.MultiStringSelectionDialog;
-import org.talend.core.ui.context.StringTextDialog;
 import org.talend.core.utils.TalendQuoteUtils;
 
 /**
@@ -45,7 +44,7 @@ public class NatTableCellEditorFactory {
         String currentType = para.getType();
         if (currentType != null) {
             if (isFile(currentType) || isDate(currentType) || isDirectory(currentType) || isList(currentType)
-                    || isResource(currentType) || isString(currentType)) {
+                    || isResource(currentType)) {
                 return true;
             }
         }
@@ -68,8 +67,6 @@ public class NatTableCellEditorFactory {
                 defalutDataValue = para.getDisplayValue();
             } else if (isResource(currentType)) {
                 transformResult = openResourcesDialogForCellEditor(parentShell, para);
-            } else if (isString(currentType)) {
-                transformResult = openStringDialogFoeCellEditor(parentShell, para);
             }
         }
         return transformResult;
@@ -143,15 +140,6 @@ public class NatTableCellEditorFactory {
         return ContextNatTableUtils.getSpecialTypeDisplayValue(JavaTypesManager.RESOURCE.getId(), value);
     }
 
-    private String openStringDialogFoeCellEditor(Shell parentShell, IContextParameter para) {
-        StringTextDialog stringTextDialog = new StringTextDialog(parentShell, para.getValue());
-        int open = stringTextDialog.open();
-        if (open == Dialog.OK) {
-            return stringTextDialog.getTextContent();
-        }
-        return "";
-    }
-
     public static String getAddQuoteString(String path) {
         ECodeLanguage codeLanguage = LanguageManager.getCurrentLanguage();
         if (codeLanguage == ECodeLanguage.PERL) {
@@ -196,10 +184,6 @@ public class NatTableCellEditorFactory {
         return MetadataToolHelper.isResource(value);
     }
 
-    public static boolean isString(final String value) {
-        return JavaTypesManager.STRING.getId().equals(value);
-    }
-
     /**
      * For the different value between display value and real value, due to nattable model comes from context, if set
      * new context parameter value in this factory, then the UpdateDataCommandHandler of nattable will treat this as no

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ProxyDynamicCellEditor.java

@@ -146,13 +146,4 @@ public class ProxyDynamicCellEditor extends AbstractCellEditor {
         return super.commit(direction, closeAfterCommit, skipValidation);
     }
 
-    @Override
-    public void addEditorControlListeners() {
-        if (dynamicEditor != null) {
-            dynamicEditor.addEditorControlListeners();
-        } else {
-            super.addEditorControlListeners();
-        }
-    }
-
 }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/documentation/generation/ExternalNodeComponentHandler.java

@@ -271,7 +271,6 @@ public class ExternalNodeComponentHandler extends AbstractComponentHandler {
                     value = eleObj.toString();
                 }
 
-                String repositoryValue = null;
                 if (elemparameter.getName().equals(EParameterFieldType.PROPERTY_TYPE.getName())
                         && value.equals(IHTMLDocConstants.REPOSITORY)) {
                     String repositoryValueForPropertyType = getRepositoryValueForPropertyType(copyElementParameterList,
@@ -299,8 +298,8 @@ public class ExternalNodeComponentHandler extends AbstractComponentHandler {
                 // value = checkString(type.getListItemsDisplayName()[index]);
                 // }
 
-                else if ((repositoryValue = elemparameter.calcRepositoryValue()) != null
-                        && repositoryValue.toUpperCase().contains("PASSWORD") //$NON-NLS-1$
+                else if (elemparameter.getRepositoryValue() != null
+                        && elemparameter.getRepositoryValue().toUpperCase().contains("PASSWORD") //$NON-NLS-1$
                         || EParameterFieldType.isPassword(elemparameter.getFieldType())) {
                     value = ParameterValueUtil.getValue4Doc(elemparameter).toString();
                 }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/documentation/generation/InternalNodeComponentHandler.java

@@ -205,7 +205,6 @@ public class InternalNodeComponentHandler extends AbstractComponentHandler {
                 if (eleObj != null) {
                     value = eleObj.toString();
                 }
-                String repositoryValue = null;
                 if (elemparameter.getFieldType() == EParameterFieldType.PROPERTY_TYPE) {
                     param = getElementParameter(elemparameter, EParameterFieldType.PROPERTY_TYPE);
                     if (param != null) {
@@ -242,8 +241,8 @@ public class InternalNodeComponentHandler extends AbstractComponentHandler {
                 // int index = type.getIndexOfItemFromList(type.getDisplayName());
                 // value = checkString(type.getListItemsDisplayName()[index]);
                 // }
-                else if ((repositoryValue = elemparameter.calcRepositoryValue()) != null
-                        && repositoryValue.toUpperCase().contains("PASSWORD") //$NON-NLS-1$
+                else if (elemparameter.getRepositoryValue() != null
+                        && elemparameter.getRepositoryValue().toUpperCase().contains("PASSWORD") //$NON-NLS-1$
                         || EParameterFieldType.isPassword(elemparameter.getFieldType())) {
                     name = elemparameter.getDisplayName();
                     value = ParameterValueUtil.getValue4Doc(elemparameter).toString();

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/dialog/MetadataDialog.java

@@ -210,12 +210,10 @@ public class MetadataDialog extends Dialog {
             if (component.isSupportDbType() || component.getOriginalFamilyName().startsWith(DATABASE_LABEL)
                     || eltComponent || isEBCDIC) {
                 dbComponent = !isEBCDIC;
-                if (!isNewFram) {
-                    for (IElementParameter currentParam : node.getElementParameters()) {
-                        if (currentParam.getFieldType().equals(EParameterFieldType.MAPPING_TYPE)) {
-                            metaView.setCurrentDbms((String) currentParam.getValue());
-                            hasMappingType = true;
-                        }
+                for (IElementParameter currentParam : node.getElementParameters()) {
+                    if (currentParam.getFieldType().equals(EParameterFieldType.MAPPING_TYPE)) {
+                        metaView.setCurrentDbms((String) currentParam.getValue());
+                        hasMappingType = true;
                     }
                 }
 
@@ -243,9 +241,8 @@ public class MetadataDialog extends Dialog {
                             }
                             String componentDbType = ""; //$NON-NLS-1$
                             for (IElementParameter param : (List<IElementParameter>) node.getElementParameters()) {
-                                String repositoryValue = param.calcRepositoryValue();
-                                if (repositoryValue != null) {
-                                    if (repositoryValue.equals("TYPE")) { //$NON-NLS-1$
+                                if (param.getRepositoryValue() != null) {
+                                    if (param.getRepositoryValue().equals("TYPE")) { //$NON-NLS-1$
                                         componentDbType = (String) param.getValue();
                                     }
                                 }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/editor/AbstractMetadataTableEditorView.java

@@ -16,7 +16,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
@@ -110,8 +109,6 @@ public abstract class AbstractMetadataTableEditorView<B> extends AbstractDataTab
 
     public static final String ID_COLUMN_USEFUL = "ID_COLUMN_USEFUL";
 
-    public static final String ID_COLUMN_ROW_NUM = "ID_COLUMN_ROW_NUM";
-
     protected boolean showDbColumnName, showOriginalLength;
 
     protected boolean showDbTypeColumn;
@@ -234,7 +231,12 @@ public abstract class AbstractMetadataTableEditorView<B> extends AbstractDataTab
     @Override
     protected void createColumns(TableViewerCreator<B> tableViewerCreator, Table table) {
         // //////////////////////////////////////////////////////////////////////////////////////
-        configureRowNumColumn(tableViewerCreator);
+        tableViewerCreator.setReadOnly(false);
+        TableViewerCreatorColumn column = new TableViewerCreatorColumn(tableViewerCreator);
+        column.setTitle(""); //$NON-NLS-1$
+        column.setDefaultInternalValue(""); //$NON-NLS-1$
+        column.setWidth(15);
+
         if (isRepository) {
             configureUsefulColumn(tableViewerCreator);
         }
@@ -331,25 +333,6 @@ public abstract class AbstractMetadataTableEditorView<B> extends AbstractDataTab
         }
     }
 
-    protected abstract IBeanPropertyAccessors<B, Integer> getRowNumAccessor();
-
-    protected void configureRowNumColumn(TableViewerCreator<B> tableViewerCreator) {
-        TableViewerCreatorColumn column;
-        column = new TableViewerCreatorColumn(tableViewerCreator);
-        column.setTitle("");
-        column.setToolTipHeader("");
-        column.setId(ID_COLUMN_ROW_NUM);
-        column.setBeanPropertyAccessors(getRowNumAccessor());
-        column.setWeight(5);
-        column.setModifiable(false);
-        if (Platform.OS_MACOSX.equals(Platform.getOS())) {
-            column.setMinimumWidth(10);
-        } else {
-            column.setMinimumWidth(30);
-        }
-        column.setSortable(true);
-    }
-
     protected void configureUsefulColumn(TableViewerCreator<B> tableViewerCreator) {
         TableViewerCreatorColumn column;
         column = new TableViewerCreatorColumn(tableViewerCreator);

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/editor/MetadataEmfTableEditorView.java

@@ -29,7 +29,6 @@ import org.talend.core.model.metadata.builder.connection.impl.MetadataColumnImpl
 import org.talend.core.model.metadata.types.TypesManager;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.ui.proposal.JavaSimpleDateFormatProposalProvider;
-
 import orgomg.cwm.objectmodel.core.TaggedValue;
 
 /**
@@ -575,22 +574,4 @@ public class MetadataEmfTableEditorView extends AbstractMetadataTableEditorView<
         // TODO Auto-generated method stub
         return null;
     }
-
-
-    @Override
-    protected IBeanPropertyAccessors<MetadataColumn, Integer> getRowNumAccessor() {
-        return new IBeanPropertyAccessors<MetadataColumn, Integer>() {
-
-            @Override
-            public Integer get(MetadataColumn bean) {
-                return bean.getRowNum();
-            }
-
-            @Override
-            public void set(MetadataColumn bean, Integer value) {
-                bean.setRowNum(value);
-            }
-
-        };
-    }
 }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/editor/MetadataTableEditorView.java

@@ -181,25 +181,6 @@ public class MetadataTableEditorView extends AbstractMetadataTableEditorView<IMe
         };
     }
 
-    int rowNum = 0;
-
-    @Override
-    protected IBeanPropertyAccessors<IMetadataColumn, Integer> getRowNumAccessor() {
-        return new IBeanPropertyAccessors<IMetadataColumn, Integer>() {
-
-            @Override
-            public Integer get(IMetadataColumn bean) {
-                return bean.getRowNum();
-            }
-
-            @Override
-            public void set(IMetadataColumn bean, Integer value) {
-                bean.setRowNum(value);
-            }
-
-        };
-    }
-
     @Override
     protected IBeanPropertyAccessors<IMetadataColumn, String> getCommentAccessor() {
         return new IBeanPropertyAccessors<IMetadataColumn, String>() {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/extended/command/MetadataEmfImportXmlCommand.java

@@ -21,7 +21,6 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.eclipse.gef.commands.Command;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
-import org.talend.commons.ui.runtime.swt.tableviewer.TableViewerCreatorNotModifiable;
 import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
 import org.talend.core.model.metadata.MetadataColumnsAndDbmsId;
 import org.talend.core.model.metadata.MetadataSchema;
@@ -82,11 +81,7 @@ public class MetadataEmfImportXmlCommand extends Command {
                     editor.getEditorView().setCurrentDbms(dbmsId);
                 }
             }
-            // when not lazy load need to do refresh to refresh the row number
-            if (!TableViewerCreatorNotModifiable.getRecommandLazyLoad()
-                    && !TableViewerCreatorNotModifiable.isLazyLoadingEnabled()) {
-                extendedTableModel.getTableViewer().refresh();
-            }
+
         } catch (ParserConfigurationException e) {
             ExceptionHandler.process(e);
         } catch (SAXException e) {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/extended/command/MetadataImportXmlCommand.java

@@ -21,7 +21,6 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.eclipse.gef.commands.Command;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
-import org.talend.commons.ui.runtime.swt.tableviewer.TableViewerCreatorNotModifiable;
 import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
 import org.talend.core.model.metadata.IMetadataColumn;
 import org.talend.core.model.metadata.MetadataSchema;
@@ -69,11 +68,7 @@ public class MetadataImportXmlCommand extends Command {
             extendedTableModel.removeAll(removed);
             added = MetadataSchema.initializeColumns(file);
             extendedTableModel.addAll(added);
-            // when not lazy load need to do refresh to refresh the row number
-            if (!TableViewerCreatorNotModifiable.getRecommandLazyLoad()
-                    && !TableViewerCreatorNotModifiable.isLazyLoadingEnabled()) {
-                extendedTableModel.getTableViewer().refresh();
-            }
+
         } catch (ParserConfigurationException e) {
             ExceptionHandler.process(e);
         } catch (SAXException e) {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/notification/Java17NotificationPopup.java

@@ -30,7 +30,6 @@ import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.LoginException;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.nofitication.ArrangedNotificationPopup;
-import org.talend.commons.utils.generation.JavaUtils;
 import org.talend.core.CorePlugin;
 import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
@@ -80,7 +79,7 @@ public class Java17NotificationPopup extends ArrangedNotificationPopup {
     }
 
     public static boolean show() {
-        return !showOnce() && JavaUtils.isJava17() && (!ModuleAccessHelper.allowJavaInternalAcess(null) || !checkInterpreter());
+        return !showOnce() && isJava17() && (!ModuleAccessHelper.allowJavaInternalAcess(null) || !checkInterpreter());
     }
 
     private static boolean showOnce() {
@@ -133,4 +132,17 @@ public class Java17NotificationPopup extends ArrangedNotificationPopup {
         return false;
     }
 
+    private static boolean isJava17() {
+        boolean isJava17 = false;
+        String javaVersion = System.getProperty("java.version");
+        String[] arr = javaVersion.split("[^\\d]+");
+        try {
+            isJava17 = Integer.parseInt(arr[0]) >= 17;
+        } catch (NumberFormatException e) {
+            ExceptionHandler.process(e);
+            isJava17 = false;
+        }
+        return isJava17;
+    }
+
 }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/services/IGitUIProviderService.java

@@ -30,8 +30,6 @@ public interface IGitUIProviderService extends IService {
     public String[] changeCredentials(Shell parent, Serializable uriIsh, String initUser, boolean canStoreCredentials);
 
     boolean checkPendingChanges();
-    
-    boolean checkUncommittedFiles();
 
     public void openPushFailedDialog(Object pushResult);
 

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

@@ -15,11 +15,8 @@ package org.talend.core.ui.token;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.talend.commons.utils.VersionUtils;
-import org.talend.commons.utils.generation.JavaUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.prefs.ITalendCorePrefConstants;
-import org.talend.core.runtime.CoreRuntimePlugin;
-import org.talend.core.runtime.util.SharedStudioUtils;
 import org.talend.core.ui.CoreUIPlugin;
 import org.talend.core.ui.branding.IBrandingService;
 import org.talend.daikon.token.TokenGenerator;
@@ -44,10 +41,6 @@ public class DefaultTokenCollector extends AbstractTokenCollector {
 
     private static final TokenKey OS = new TokenKey("os"); //$NON-NLS-1$
 
-    private static final TokenKey SHARE_MODE = new TokenKey("share.mode"); //$NON-NLS-1$
-
-    private static final TokenKey ENABLED_JAVA17_COMPATIBILITY = new TokenKey("enabled.java17.compatibility"); //$NON-NLS-1$
-
     public static final String COLLECTOR_SYNC_NB = "COLLECTOR_SYNC_NB"; //$NON-NLS-1$
 
     public DefaultTokenCollector() {
@@ -77,7 +70,7 @@ public class DefaultTokenCollector extends AbstractTokenCollector {
 
         // typeStudio
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IBrandingService.class)) {
-            IBrandingService brandingService = GlobalServiceRegister.getDefault().getService(
+            IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault().getService(
                     IBrandingService.class);
             tokenStudioObject.put(TYPE_STUDIO.getKey(), brandingService.getAcronym());
             // tokenStudioObject.put(TYPE_STUDIO.getKey(), brandingService.getShortProductName());
@@ -99,11 +92,6 @@ public class DefaultTokenCollector extends AbstractTokenCollector {
             tokenStudioObject.put(STOP_COLLECTOR.getKey(), "0"); //$NON-NLS-1$
         }
         
-        // Share mode
-        tokenStudioObject.put(SHARE_MODE.getKey(), SharedStudioUtils.isSharedStudioMode());
-        // Enable Java 17 compatibility
-        tokenStudioObject.put(ENABLED_JAVA17_COMPATIBILITY.getKey(), CoreRuntimePlugin.getInstance().getProjectPreferenceManager()
-                .getPreferenceStore().getBoolean(JavaUtils.ALLOW_JAVA_INTERNAL_ACCESS));
         return tokenStudioObject;
     }
 }

main/plugins/org.talend.core/src/main/java/org/talend/core/model/action/DisableLanguageActions.java

@@ -50,6 +50,7 @@ public class DisableLanguageActions implements IStartup {
         }
 
         ECodeLanguage lan = LanguageManager.getCurrentLanguage();
+
         switch (lan) {
         case JAVA:
             ids = Arrays.asList(new String[] { "org.talend.help.perl.OpenPerlHelpAction" }); //$NON-NLS-1$

main/plugins/org.talend.core/src/main/java/org/talend/core/model/metadata/QueryUtil.java

@@ -17,7 +17,6 @@ import java.util.List;
 import org.talend.core.CorePlugin;
 import org.talend.core.database.EDatabaseTypeName;
 import org.talend.core.language.LanguageManager;
-import org.talend.core.model.metadata.builder.connection.TacokitDatabaseConnection;
 import org.talend.core.model.metadata.query.GenerateQueryFactory;
 import org.talend.core.model.metadata.query.IQueryGenerator;
 import org.talend.core.model.process.EParameterFieldType;
@@ -59,6 +58,7 @@ public class QueryUtil {
                 case ORACLEFORSID:
                 case ORACLESN:
                 case PSQL:
+                case PLUSPSQL:
                 case AS400:
                 case ACCESS:
                 case MYSQL:
@@ -408,9 +408,6 @@ public class QueryUtil {
             if(param == null){
                 param = node.getElementParameterFromField(EParameterFieldType.NAME_SELECTION_REFERENCE);
             }
-            if(param == null){
-                param = node.getElementParameter(TacokitDatabaseConnection.KEY_DATASET_TABLE_NAME);
-            }
             if (param != null && param.isShow(node.getElementParameters())) {
                 return (String) param.getValue();
             }
@@ -418,6 +415,17 @@ public class QueryUtil {
         return null;
     }
 
+    private static String getDbName(Element node) {
+        String dbName = null;
+        if (node != null) { // for job settings extra.(feature 2710)
+            IElementParameter param = node.getElementParameter("DBNAME");
+            if (param != null && param.isShow(node.getElementParameters())) {
+                dbName = TalendTextUtils.removeQuotes((String) param.getValue());
+            }
+        }
+        return dbName;
+    }
+
     private static String checkAndConcatString(String str1, String str2) {
         if (str1 == null) {
             str1 = ""; //$NON-NLS-1$

main/plugins/org.talend.core/src/main/java/org/talend/core/model/metadata/query/AbstractQueryGenerator.java

@@ -21,7 +21,6 @@ import org.talend.core.language.LanguageManager;
 import org.talend.core.model.metadata.IMetadataColumn;
 import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.QueryUtil;
-import org.talend.core.model.metadata.builder.connection.TacokitDatabaseConnection;
 import org.talend.core.model.process.EParameterFieldType;
 import org.talend.core.model.process.IElement;
 import org.talend.core.model.process.IElementParameter;
@@ -144,9 +143,6 @@ public abstract class AbstractQueryGenerator implements IQueryGenerator {
             IElementParameter param = elem.getElementParameterFromField(EParameterFieldType.DBTABLE);
             if(param == null){
                 param = elem.getElementParameterFromField(EParameterFieldType.NAME_SELECTION_REFERENCE);
-            }   
-            if(param == null){
-                param = elem.getElementParameter(TacokitDatabaseConnection.KEY_DATASET_TABLE_NAME);
             }
             if (param != null) {
                 if (param.isShow(elem.getElementParameters())) {
@@ -223,7 +219,7 @@ public abstract class AbstractQueryGenerator implements IQueryGenerator {
     protected String getSchema(IElement elem) {
         if (elem != null) {
             for (IElementParameter param : elem.getElementParameters()) {
-                if ("SCHEMA".equals(param.calcRepositoryValue())) { //$NON-NLS-1$
+                if ("SCHEMA".equals(param.getRepositoryValue())) { //$NON-NLS-1$
                     if (param.isShow(elem.getElementParameters())) {
                         String value = (String) param.getValue();
                         if (value != null) {

main/plugins/org.talend.core/src/main/java/org/talend/core/model/metadata/query/GenerateQueryFactory.java

@@ -53,6 +53,7 @@ public final class GenerateQueryFactory {
             return new ImpalaQueryGenerator(dbType);
         case NETEZZA:
             return new NetezzaQueryGenerator();
+        case PLUSPSQL:
         case PSQL:
             return new PostgreQueryGenerator(dbType);
         case AS400:

main/plugins/org.talend.core/src/main/java/org/talend/core/model/param/EConnectionParameterName.java

@@ -49,12 +49,12 @@ public enum EConnectionParameterName {
     // TDQ-17294~
 
     GENERIC_TABLENAME("tableSelection.tablename"),//$NON-NLS-1$
-    GENERIC_USERNAME("configuration.userId"), //$NON-NLS-1$
-    GENERIC_PASSWORD("configuration.password"), //$NON-NLS-1$
-    GENERIC_URL("configuration.jdbcUrl"), //$NON-NLS-1$
-    GENERIC_DRIVER_JAR("configuration.jdbcDriver"), //$NON-NLS-1$
-    GENERIC_DRIVER_CLASS("configuration.jdbcClass"), //$NON-NLS-1$
-    GENERIC_MAPPING_FILE("configuration.dbMapping"); //$NON-NLS-1$
+    GENERIC_USERNAME("connection.userPassword.userId"),//$NON-NLS-1$
+    GENERIC_PASSWORD("connection.userPassword.password"),//$NON-NLS-1$
+    GENERIC_URL("connection.jdbcUrl"),//$NON-NLS-1$
+    GENERIC_DRIVER_JAR("connection.driverTable"),//$NON-NLS-1$
+    GENERIC_DRIVER_CLASS("connection.driverClass"), //$NON-NLS-1$
+    GENERIC_MAPPING_FILE("mappingFile"); //$NON-NLS-1$
 
 
     private String displayName;

main/plugins/org.talend.core/src/main/java/org/talend/core/model/runprocess/shadow/ObjectElementParameter.java

@@ -361,7 +361,7 @@ public class ObjectElementParameter implements IElementParameter {
      * @see org.talend.core.model.process.IElementParameter#getRepositoryValue()
      */
     @Override
-    public String calcRepositoryValue() {
+    public String getRepositoryValue() {
         return null;
     }
 

main/plugins/org.talend.core/src/main/java/org/talend/core/model/utils/TalendTextUtils.java

@@ -613,7 +613,7 @@ public class TalendTextUtils {
      * @return
      */
     private static boolean isPSQLSimilar(EDatabaseTypeName name) {
-        return !name.equals(EDatabaseTypeName.PSQL)
+        return !name.equals(EDatabaseTypeName.PSQL) && !name.equals(EDatabaseTypeName.PLUSPSQL)
                 && !name.equals(EDatabaseTypeName.GREENPLUM);
     }
 

main/plugins/org.talend.core/src/main/java/org/talend/core/prefs/CorePreferenceInitializer.java

@@ -67,8 +67,6 @@ public class CorePreferenceInitializer extends AbstractPreferenceInitializer {
             node.put(ITalendCorePrefConstants.JAVA_INTERPRETER, javaPath + JAVA_WIN32_INTERPRETER);
         } else if (os.equals(Platform.OS_LINUX)) {
             node.put(ITalendCorePrefConstants.JAVA_INTERPRETER, javaPath + JAVA_LINUX_INTERPRETER_PATH);
-        } else if (os.toLowerCase().contains("mac")) {
-            node.put(ITalendCorePrefConstants.JAVA_INTERPRETER, javaPath + JAVA_LINUX_INTERPRETER_PATH);
         }
 
         // Sets default language

main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java

@@ -1085,7 +1085,7 @@ public class ProcessorUtilities {
                 if (childBuildType == null) {
                     Property parentProperty = parentJobInfo.getProcessor().getProperty();
                     String parentBuildType = (String)parentProperty.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE);
-                    if (parentBuildType!= null && parentBuildType.contains("ROUTE")) {
+                    if ("ROUTE".equalsIgnoreCase(parentBuildType)) {
                     	childProperty.getAdditionalProperties().put(TalendProcessArgumentConstant.ARG_BUILD_TYPE, "OSGI");
                     }
                 }