Compare commits

...

4 Commits

Author SHA1 Message Date
vyu-talend
126daf55ab chore(TDI-49458):bump file enhanced. (#6086) 2023-03-30 22:08:28 +08:00
Jane Ding
4f5ce34920 fix(TUP-37227):Issue building when items names too long (#6085)
https://jira.talendforge.org/browse/TUP-37227
2023-03-30 18:15:12 +08:00
Oleksandr Zhelezniak
4b377af1aa chore(TDI-49600): bump connectors 1.27.21 2023-03-24 15:09:35 +02:00
Jane Ding
695dcba405 Revert "fix(TUP-37227):Issue building when items names too long (#5941)" (#6019)
This reverts commit 8d3832fdfb.
2023-03-02 09:44:55 +08:00
7 changed files with 7 additions and 60 deletions

View File

@@ -18,7 +18,6 @@ import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import org.apache.commons.lang.StringUtils;
import org.talend.components.api.properties.ComponentProperties;
import org.talend.core.model.components.IComponent;
import org.talend.core.model.components.IMultipleComponentManager;
@@ -90,8 +89,6 @@ public abstract class AbstractNode implements INode {
private String uniqueShortName;
private String generatingUniqueName;
private boolean subProcessContainBreakpoint;
private boolean isThereLinkWithRef = Boolean.FALSE;
@@ -1343,17 +1340,4 @@ public abstract class AbstractNode implements INode {
public void setRealGraphicalNode(INode realGraphicalNode) {
this.realGraphicalNode = realGraphicalNode;
}
@Override
public String getGeneratingUniqueName() {
if (StringUtils.isNotBlank(generatingUniqueName)) {
return generatingUniqueName;
}
return getUniqueName();
}
@Override
public void setGeneratingUniqueName(String generatingUniqueName) {
this.generatingUniqueName = generatingUniqueName;
}
}

View File

@@ -61,18 +61,6 @@ public interface INode extends IElement {
public String getUniqueShortName();
public void setUniqueShortName(String uniqueShortName);
/**
* Return the unique name of the node or the full path unique name during generate. For replaced joblet nodes,
* getUniqueName() returns name prefix would be short name
*
* @return
*/
public String getGeneratingUniqueName();
public void setGeneratingUniqueName(String generatingUniqueName);
/**
* Return the start status of this node.
*

View File

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

View File

@@ -21,7 +21,6 @@ import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.part.MultiPageEditorPart;
import org.talend.commons.exception.PersistenceException;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.IService;
import org.talend.core.model.components.IComponent;
import org.talend.core.model.metadata.IMetadataTable;
@@ -150,14 +149,4 @@ public interface IJobletProviderService extends IService {
public IProcess getJobletGEFProcessFromNode(INode node);
public void clearJobletProcessProviderCache();
public static IJobletProviderService get() {
GlobalServiceRegister register = GlobalServiceRegister.getDefault();
if (!register.isServiceRegistered(IJobletProviderService.class)) {
return null;
}
return register.getService(IJobletProviderService.class);
}
}

View File

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

View File

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

View File

@@ -91,12 +91,6 @@ public class TestFakeNode extends Element implements INode {
return null;
}
@Override
public void setUniqueShortName(String uniqueShortName) {
// TODO Auto-generated method stub
}
/*
* (non-Javadoc)
*
@@ -913,16 +907,4 @@ public class TestFakeNode extends Element implements INode {
return null;
}
@Override
public String getGeneratingUniqueName() {
// TODO Auto-generated method stub
return null;
}
@Override
public void setGeneratingUniqueName(String generatingUniqueName) {
// TODO Auto-generated method stub
}
}