jprdonnelly/tcommon-studio-se
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(TUP-23905): Job disappearing after merging git branches

Browse Source 
https://jira.talendforge.org/browse/TUP-23905
This commit is contained in:
Chao MENG
2019-10-14 18:27:22 +08:00
parent 8b28d1e29d
commit b2b40eb6db
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
main/plugins/org.talend.repository.items.importexport/src/main/java/org/talend/repository/items/importexport/handlers/ImportExportHandlersManager.java
View File

@@ -925,13 +925,18 @@ public class ImportExportHandlersManager {
if (itemRecord.isImported()) {
return;
}
if (alwaysRegenId || itemRecord.getState() == State.ID_EXISTED
|| itemRecord.getState() == State.NAME_AND_ID_EXISTED_BOTH
if (alwaysRegenId || itemRecord.getState() == State.ID_EXISTED || itemRecord.getState() == State.NAME_AND_ID_EXISTED_BOTH
|| itemRecord.getState() == State.NAME_EXISTED) {
Map<String, String> nameToIdMap = changeIdManager.getNameToIdMap();
String id = nameToIdMap.get(itemRecord.getProperty().getLabel()
+ ERepositoryObjectType.getItemType(itemRecord.getProperty().getItem())
.toString());
Map<Object, String> itemToIdMap = changeIdManager.getItemToIdMap();
Property property = itemRecord.getProperty();
ERepositoryObjectType repObjType = ERepositoryObjectType.getItemType(property.getItem());
/**
* 1. Use path + label, because some repository type allow same name with different path<br/>
* 2. Don't use path from ImportItem, because there may be same item with different version<br/>
*/
final String key = repObjType.toString() + "#" + property.getItem().getState().getPath() + "#" + property.getLabel();
String id = itemToIdMap.get(key);
if (id == null) {
try {
boolean reuseExistingId = false;
@@ -953,8 +958,7 @@ public class ImportExportHandlersManager {
if (reuseExistingId) {
IRepositoryViewObject object = itemRecord.getExistingItemWithSameName();
if (object != null) {
if (ProjectManager.getInstance().isInCurrentMainProject(
object.getProperty())) {
if (ProjectManager.getInstance().isInCurrentMainProject(object.getProperty())) {
// in case it is in reference project
id = object.getId();
}
@@ -965,14 +969,12 @@ public class ImportExportHandlersManager {
}
if (id == null) {
/*
* if id exsist then need to genrate new id for this job,in this case
* the job won't override the old one
* if id exsist then need to genrate new id for this job,in this case the job won't override the old
* one
*/
id = EcoreUtil.generateUUID();
}
nameToIdMap.put(itemRecord.getProperty().getLabel()
+ ERepositoryObjectType.getItemType(itemRecord.getProperty().getItem())
.toString(), id);
itemToIdMap.put(key, id);
}
String oldId = itemRecord.getProperty().getId();
if (updateProperty) {

8
main/plugins/org.talend.repository.items.importexport/src/main/java/org/talend/repository/items/importexport/manager/ChangeIdManager.java
View File

@@ -75,7 +75,7 @@ public class ChangeIdManager {
private Map<String, String> oldId2NewIdMap = new HashMap<String, String>();
private Map<String, String> nameToIdMap = new HashMap<String, String>();
private Map<Object, String> item2IdMap = new HashMap<>();
private Set<String> idsNeed2CheckRefs = new HashSet<String>();
@@ -92,7 +92,7 @@ public class ChangeIdManager {
refIds2ItemIdsMap.clear();
oldId2NewIdMap.clear();
idsNeed2CheckRefs.clear();
nameToIdMap.clear();
item2IdMap.clear();
currentProject = null;
}
@@ -610,8 +610,8 @@ public class ChangeIdManager {
return currentProject;
}
public Map<String, String> getNameToIdMap() {
return nameToIdMap;
public Map<Object, String> getItemToIdMap() {
return item2IdMap;
}
private void checkCancel(IProgressMonitor monitor) throws Exception {