Compare commits

...

5 Commits

Author SHA1 Message Date
apoltavtsev
7f57f5c361 fix(APPINT-32979) Compile Route with child Jobs on codegen stage 2021-08-12 11:19:31 +02:00
Jane Ding
cdd45dec8b feat(TUP-28580):Replace current "Copy to branch", with "Copy from (#4449)
branch"
https://jira.talendforge.org/browse/TUP-28580
2021-07-19 17:19:24 +08:00
Jane Ding
c6f054dd36 feat(TUP-28580):Replace current "Copy to branch", with "Copy from (#4441) (#4442)
branch"
https://jira.talendforge.org/browse/TUP-28580
2021-07-16 17:37:17 +08:00
cbadillo1603
d2c62cdb4b fix(TBD-12715):Knox check HDFS service (#4408) (#4440)
* fix(TBD-12715):Knox check HDFS service

* fix(TBD-12715):Knox check HDFS service

* fix(TBD-12715):Knox check HDFS service
2021-07-16 11:32:41 +02:00
jiezhang-tlnd
9705fd726a fix(TUP-32130)CVE: json-smart-2.4.2.jar (#4437) 2021-07-16 10:28:51 +08:00
6 changed files with 68 additions and 5 deletions

View File

@@ -334,5 +334,19 @@ public class ConnParameterKeys {
public static final String CONN_PARA_KEY_SET_HADOOP_CONF = "CONN_PARA_KEY_SET_HADOOP_CONF";
public static final String CONN_PARA_KEY_HADOOP_CONF_SPECIFIC_JAR = "CONN_PARA_KEY_HADOOP_CONF_SPECIFIC_JAR";
/**Knox*/
public static final String CONN_PARA_KEY_SPARK_MODE="CONN_PARA_KEY_SPARK_MODE";
public static final String CONN_PARA_KEY_USE_KNOX="CONN_PARA_KEY_USE_KNOX";
public static final String CONN_PARA_KEY_KNOX_URL="CONN_PARA_KEY_KNOX_URL";
public static final String CONN_PARA_KEY_KNOX_USER = "CONN_PARA_KEY_KNOX_USER";
public static final String CONN_PARA_KEY_KNOX_PASSWORD="CONN_PARA_KEY_KNOX_PASSWORD";
public static final String CONN_PARA_KEY_KNOX_DIRECTORY="CONN_PARA_KEY_KNOX_DIRECTORY";
}

View File

@@ -87,8 +87,8 @@ public enum EDatabaseVersion4Drivers {
"Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.25.jar", "slf4j-log4j12-1.7.25.jar", "adal4j-1.6.5.jar", //$NON-NLS-1$
"commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.6.jar", "oauth2-oidc-sdk-6.5.jar",
"json-smart-2.4.2.jar", "nimbus-jose-jwt-8.11.jar", "javax.mail-1.6.2.jar", "log4j-1.2.17.jar",
"accessors-smart-1.1.jar", "asm-5.0.3.jar" })),
"json-smart-2.4.7.jar", "nimbus-jose-jwt-8.11.jar", "javax.mail-1.6.2.jar", "log4j-1.2.17.jar",
"accessors-smart-2.4.7.jar", "asm-9.1.jar" })),
VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
VERTICA_7_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.1.X (Deprecated)", "VERTICA_7_1_X", "vertica-jdbc-7.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

View File

@@ -728,6 +728,46 @@ public final class ProcessUtils {
}
return null;
}
private static boolean isRoute(Property property) {
return property!= null && (ERepositoryObjectType.getType(property).equals(ERepositoryObjectType.PROCESS_ROUTE) ||
ERepositoryObjectType.getType(property).equals(ERepositoryObjectType.PROCESS_ROUTE_MICROSERVICE));
}
public static boolean isRouteWithChildJobs(IProcess process) {
if (process instanceof IProcess2) {
Property p = ((IProcess2) process).getProperty();
if (isRoute(p)) {
return false;
}
Item item = p.getItem();
return isRouteWithChildJobs(item);
} else {
for (INode node : process.getGraphicalNodes()) {
if (node.getComponent().getName().equals("cTalendJob")) {
return true;
}
}
}
return false;
}
public static boolean isRouteWithChildJobs(Item item) {
if (item!= null && item instanceof ProcessItem) {
for (Object obj : ((ProcessItem) item).getProcess().getNode()) {
if (obj instanceof NodeType) {
if (((NodeType) obj).getComponentName().equals("cTalendJob")) {
return true;
}
}
}
}
return false;
}
public static int getAssertAmount(IProcess process) {
int count = 0;

View File

@@ -138,8 +138,15 @@ public class ExtendedNodeConnectionContextUtils {
DataBricksCloudProvider,
DataBricksClusterId,
DataBricksToken,
DataBricksDBFSDepFolder
DataBricksDBFSDepFolder,
//Knox
SparkMode,
UseKnox,
KnoxUrl,
KnoxUsername,
KnoxPassword,
KnoxDirectory
}
static List<IContextParameter> getContextVariables(final String prefixName, Connection conn, Set<IConnParamName> paramSet) {

View File

@@ -381,6 +381,8 @@ public class ImportItemsWizardPage extends WizardPage {
if (dependencyButton.getSelection()) {
handleImportDependencies();
}
filteredCheckboxTree.calculateCheckedLeafNodes();
checkSelectedItemErrors();
}
});

View File

@@ -171,7 +171,7 @@ public class ImportDependencyRelationsHelper {
Property property = node.getItemRecord().getProperty();
return property.getId().equals(id) && property.getVersion().equals(version) && projectFlag;
});
return importNodeList == null ? null : importNodeList.get(0);
return importNodeList == null || importNodeList.isEmpty() ? null : importNodeList.get(0);
}
private List<ItemImportNode> getItemImportNode(List<ItemImportNode> allImportItemNodesList,