Compare commits

...

1 Commits

Author SHA1 Message Date
Jane Ding
0159c462cb Revert "fix(TUP-37227):Issue building when items names too long (#8412)" (#8518)
This reverts commit 2ea39fb234.
2023-03-01 19:49:47 +08:00
2 changed files with 2 additions and 45 deletions

View File

@@ -554,9 +554,6 @@ public class DataProcess implements IGeneratingProcess {
uniqueName = prefix + uniqueName;
}
dataNode.setUniqueName(uniqueName);
if (!graphicalNode.getUniqueName().equals(graphicalNode.getGeneratingUniqueName())) {
dataNode.setGeneratingUniqueName(graphicalNode.getGeneratingUniqueName());
}
dataNode.setSubProcessStart(graphicalNode.isSubProcessStart());
dataNode.setThereLinkWithHash(graphicalNode.isThereLinkWithHash());
dataNode.setHasConditionalOutputs(graphicalNode.hasConditionalOutputs());
@@ -906,9 +903,6 @@ public class DataProcess implements IGeneratingProcess {
AbstractNode curNode;
if (component.getPluginExtension() == null) {
curNode = new DataNode(component, uniqueName);
if (!graphicalNode.getUniqueName().equals(graphicalNode.getGeneratingUniqueName())) {
curNode.setGeneratingUniqueName(graphicalNode.getGeneratingUniqueName() + "_" + curItem.getName());
}
} else {
// mapper
curNode = (AbstractNode) ExternalNodesFactory.getInstance(component.getPluginExtension());
@@ -928,9 +922,6 @@ public class DataProcess implements IGeneratingProcess {
curNode.setListConnector(graphicalNode.getListConnector());
copyElementParametersValue(graphicalNode, curNode);
curNode.setUniqueName(uniqueName);
if (!graphicalNode.getUniqueName().equals(graphicalNode.getGeneratingUniqueName())) {
curNode.setGeneratingUniqueName(graphicalNode.getGeneratingUniqueName() + "_" + curItem.getName());
}
curNode.setSubProcessStart(graphicalNode.isSubProcessStart());
curNode.setThereLinkWithHash(graphicalNode.isThereLinkWithHash());
curNode.setHasConditionalOutputs(graphicalNode.hasConditionalOutputs());
@@ -1757,9 +1748,7 @@ public class DataProcess implements IGeneratingProcess {
}
// Build a simple copy of the process (to have new objects, avoid to modify the ones in the designer..)
List<INode> newGraphicalNodeList = buildCopyOfGraphicalNodeList(graphicalNodeList);
clearNodeReplaceProviderCache();
replaceNodeFromProviders(newGraphicalNodeList);
clearNodeReplaceProviderCache();
// job settings extra (feature 2710)
if (JobSettingsManager.isImplicittContextLoadActived(duplicatedProcess)) {
List<DataNode> contextLoadNodes = JobSettingsManager.createExtraContextLoadNodes(duplicatedProcess);
@@ -3739,12 +3728,6 @@ public class DataProcess implements IGeneratingProcess {
}
}
public void clearNodeReplaceProviderCache() {
if (IJobletProviderService.get() != null) {
IJobletProviderService.get().clearJobletProcessProviderCache();
}
}
private INode addDataNode(INode dataNode) {
if (dataNode != null) {
String addedUniqueName = dataNode.getUniqueName();

View File

@@ -329,10 +329,6 @@ public class Node extends Element implements IGraphicalNode {
private IReplaceNodeHandler replaceNodeHandler;
private String uniqueShortName;
private String generatingUniqueName;
/**
* Getter for index.
*
@@ -2082,9 +2078,6 @@ public class Node extends Element implements IGraphicalNode {
externalNode.setSubProcessStart(isSubProcessStart());
externalNode.setProcess(getProcess());
externalNode.setComponent(getComponent());
if (!getUniqueName().equals(getGeneratingUniqueName())) {
externalNode.setGeneratingUniqueName(getGeneratingUniqueName());
}
}
return this.externalNode;
}
@@ -5337,14 +5330,8 @@ public class Node extends Element implements IGraphicalNode {
*/
@Override
public String getUniqueShortName() {
// should't be call from here normally, should be called from something extends AbstractNode (DataNode,
// ExternalNode...). used for joblet here
return this.uniqueShortName;
}
@Override
public void setUniqueShortName(String uniqueShortName) {
this.uniqueShortName = uniqueShortName;
// should't be call from here, should be called from something extends AbstractNode (DataNode, ExternalNode...).
return null;
}
public List<INode> getNodesFromSubProcess() {
@@ -5792,17 +5779,4 @@ public class Node extends Element implements IGraphicalNode {
this.replaceNodeHandler = replaceNodeHandler;
}
@Override
public String getGeneratingUniqueName() {
if (StringUtils.isNotBlank(generatingUniqueName)) {
return generatingUniqueName;
}
return getUniqueName();
}
@Override
public void setGeneratingUniqueName(String generatingUniqueName) {
this.generatingUniqueName = generatingUniqueName;
}
}