Merge remote-tracking branch 'origin/master' into cmeng/bugfix/TUP-23905-Duplicate_id

cmeng/bugfix/TUP-23905-Duplicate_id

Conflicts:
	main/plugins/org.talend.sdk.component.studio-integration/messages.properties

main/plugins/org.talend.sdk.component.studio-integration/messages.properties

@@ -75,4 +75,5 @@ TaCoKitCar.exception.property.notDefine=There is no [{0}] configured in the CAR
 TaCoKitCarFeature.status.succeed=[{0}] is installed successfully.
 TaCoKitCarFeature.status.failed=Failed to install [{0}].
 progress.cancel=User canceled.
-repository.node.missingparent=Items missing parent node (Deprecated) 
+repository.node.missingparent=Items missing parent node (Deprecated) 
+TaCoKitRelatedItemsUpdater.exception.connectionNotAvailable=Can't get connection from item: {0}

main/plugins/org.talend.sdk.component.studio-integration/src/main/java/org/talend/sdk/component/studio/metadata/handler/TaCoKitImportHandler.java

@@ -62,7 +62,7 @@ public class TaCoKitImportHandler extends MetadataConnectionImportHandler {
      * @param monitor progress monitor
      */
     @Override
-    protected void applyMigrationTasks(final ImportItem importItem, final IProgressMonitor monitor) {
+    public void applyMigrationTasks(final ImportItem importItem, final IProgressMonitor monitor) {
         try {
             getItem(importItem).ifPresent(connectionItem -> {
                 final TaCoKitConfigurationModel configuration = new TaCoKitConfigurationModel(connectionItem.getConnection());

main/plugins/org.talend.sdk.component.studio-integration/src/main/java/org/talend/sdk/component/studio/metadata/handler/TaCoKitRelatedItemsUpdater.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.talend.commons.exception.ExceptionHandler;
+import org.talend.core.model.metadata.builder.connection.Connection;
 import org.talend.core.model.properties.ConnectionItem;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.relationship.RelationshipItemBuilder;
@@ -14,7 +15,9 @@ import org.talend.repository.ProjectManager;
 import org.talend.repository.items.importexport.handlers.model.ImportItem;
 import org.talend.repository.items.importexport.manager.ResourcesManager;
 import org.talend.sdk.component.studio.Lookups;
+import org.talend.sdk.component.studio.i18n.Messages;
 import org.talend.sdk.component.studio.metadata.migration.TaCoKitMigrationManager;
+import org.talend.sdk.component.studio.metadata.model.TaCoKitConfigurationModel;
 
 /**
  * Updates related Jobs after metadata migration (during metadata import)
@@ -37,6 +40,16 @@ public class TaCoKitRelatedItemsUpdater extends AbstractImportResourcesHandler {
                     if (repositoryObject.getProperty().getVersion().equals(importItem.getItemVersion())) {
                         final Item item = repositoryObject.getProperty().getItem();
                         if (ConnectionItem.class.isInstance(item)) {
+                            Connection connection = ConnectionItem.class.cast(item).getConnection();
+                            if (connection == null) {
+                                ExceptionHandler.process(new Exception(
+                                        Messages.getString("TaCoKitRelatedItemsUpdater.exception.connectionNotAvailable", //$NON-NLS-1$
+                                                repositoryObject.getLabel())));
+                                continue;
+                            }
+                            if (!TaCoKitConfigurationModel.isTacokit(connection)) {
+                                continue;
+                            }
                             String version = getVersion(item, repositoryObject, versions);
                             manager().updatedRelatedItems((ConnectionItem) item, version, monitor);
                         }

test/plugins/org.talend.repository.test/src/org/talend/repository/handler/BuildJobHandlerTest.java

@@ -117,7 +117,7 @@ public class BuildJobHandlerTest {
         List<ImportItem> projectRecords = importManager.populateImportingItems(resManager, true, new NullProgressMonitor());
         assertTrue(projectRecords.size() > 0);
         importManager.importItemRecords(new NullProgressMonitor(), resManager, projectRecords, true,
-                projectRecords.toArray(new ImportItem[0]), null);
+                projectRecords.toArray(new ImportItem[0]), null, false);
 
         jobWithTdqItem = (ProcessItem) getItemById(JOB_WITH_TDQ_ID);
         jobWithTdmItem = (ProcessItem) getItemById(JOB_WITH_TDM_ID);