Update JobUtils.java

Merge branch 'master' into feat/master/TESB-29553
fix(TESB-29553) Publishing a route with cTalendJob from Studio and commandline gives different results
2020-11-17 10:07:47 +01:00 · 2020-11-16 14:09:48 +01:00 · 2020-10-13 17:12:59 +02:00 · 2020-10-13 17:11:45 +02:00 · 2020-10-13 17:05:51 +02:00
3 changed files with 22 additions and 3 deletions
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ProcessUtils.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ProcessUtils.java
@@ -1003,7 +1003,9 @@ public final class ProcessUtils {
        }
        return false;
    }
+
    
+
    public static boolean isChildRouteProcess(IProcess process) {
        List n = process.getNodesOfType("tRouteInput");
        if (n!=null && n.size()!=0) {
--- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenProcessorPom.java
+++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenProcessorPom.java
@@ -45,6 +45,7 @@ import org.talend.core.model.utils.JavaResourcesHelper;
 import org.talend.core.runtime.maven.MavenArtifact;
 import org.talend.core.runtime.maven.MavenConstants;
 import org.talend.core.runtime.maven.MavenUrlHelper;
+import org.talend.core.runtime.process.LastGenerationInfo;
 import org.talend.core.runtime.process.TalendProcessArgumentConstant;
 import org.talend.core.runtime.projectsetting.IProjectSettingTemplateConstants;
 import org.talend.core.runtime.repository.build.IMavenPomCreator;
@@ -52,6 +53,7 @@ import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.designer.maven.model.TalendMavenConstants;
 import org.talend.designer.maven.template.ETalendMavenVariables;
 import org.talend.designer.maven.tools.ProcessorDependenciesManager;
+import org.talend.designer.maven.utils.JobUtils;
 import org.talend.designer.maven.utils.PomIdsHelper;
 import org.talend.designer.maven.utils.PomUtil;
 import org.talend.designer.runprocess.IBigDataProcessor;
@@ -134,9 +136,16 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat

        Map<ETalendMavenVariables, String> variablesValuesMap = new HashMap<ETalendMavenVariables, String>();
        // no need check property is null or not, because if null, will get default ids.
-        variablesValuesMap.put(ETalendMavenVariables.JobGroupId, PomIdsHelper.getJobGroupId(property));
-        variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, PomIdsHelper.getJobArtifactId(property));
-        variablesValuesMap.put(ETalendMavenVariables.JobVersion, PomIdsHelper.getJobVersion(property));
+
+        if (JobUtils.isJob(property) && ProcessUtils.isChildRouteProcess(process)) {
+            JobInfo lastMainJob = LastGenerationInfo.getInstance().getLastMainJob();
+            variablesValuesMap.put(ETalendMavenVariables.JobGroupId, PomIdsHelper.getJobGroupId(lastMainJob.getProcessor().getProperty()));
+            variablesValuesMap.put(ETalendMavenVariables.JobVersion, PomIdsHelper.getJobVersion(lastMainJob.getProcessor().getProperty()));	    	
+        }else {
+            variablesValuesMap.put(ETalendMavenVariables.JobGroupId, PomIdsHelper.getJobGroupId(property));
+            variablesValuesMap.put(ETalendMavenVariables.JobVersion, PomIdsHelper.getJobVersion(property));	    	
+        }
+        variablesValuesMap.put(ETalendMavenVariables.JobArtifactId, PomIdsHelper.getJobArtifactId(property));	
        variablesValuesMap.put(ETalendMavenVariables.TalendJobVersion, property.getVersion());
        final String jobName = JavaResourcesHelper.escapeFileName(process.getName());
        variablesValuesMap.put(ETalendMavenVariables.JobName, jobName);
--- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/JobUtils.java
+++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/JobUtils.java
@@ -19,6 +19,7 @@ import java.util.Set;

 import org.talend.commons.exception.PersistenceException;
 import org.talend.core.GlobalServiceRegister;
+import org.talend.core.model.process.INode;
 import org.talend.core.model.process.IProcess;
 import org.talend.core.model.process.JobInfo;
 import org.talend.core.model.process.ProcessUtils;
@@ -99,6 +100,13 @@ public class JobUtils {
        }
        return clonedJobInfos;
    }
+    
+    public static boolean isRoute(Property p) {
+        if (p != null) {
+            return ERepositoryObjectType.getType(p).equals(ERepositoryObjectType.PROCESS_ROUTE);
+        }
+        return false;
+    }

    public static boolean isJob(JobInfo job) {
        if (job != null && job.getProcessItem() != null) {
Author	SHA1	Message	Date
apoltavtsev	e7f442e76d	Update JobUtils.java	2020-11-17 10:07:47 +01:00
apoltavtsev	d79e252513	Merge branch 'master' into feat/master/TESB-29553	2020-11-16 14:09:48 +01:00
apoltavtsev	6b632dcc56	fix(TESB-29553) Publishing a route with cTalendJob from Studio and commandline gives different results	2020-10-13 17:12:59 +02:00
apoltavtsev	3f7d451ee0	fix(TESB-29553) Publishing a route with cTalendJob from Studio and commandline gives different results	2020-10-13 17:11:45 +02:00
apoltavtsev	5d8b4c91ed	fix(TESB-29553) Publishing a route with cTalendJob from Studio and commandline gives different results	2020-10-13 17:05:51 +02:00