From b1fca5a99de06947ea46bfd6dc520936ff0b4e94 Mon Sep 17 00:00:00 2001
From: "stanislav.bieliaiev" <stanislav.bieliaiev@KBP1-LDL-A15327.synapse.com>
Date: Wed, 21 Sep 2022 12:19:06 +0300
Subject: [PATCH] fix(APPINT-34581) - code refactoring for getting versions

---
 .../org/talend/designer/maven/utils/PomIdsHelper.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomIdsHelper.java b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomIdsHelper.java
index f44f26ba7c..243aeb63af 100644
--- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomIdsHelper.java
+++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomIdsHelper.java
@@ -291,7 +291,7 @@ public class PomIdsHelper {
     public static String getJobVersion(Property property) {
         String version = null;
         if (property != null) {
-            boolean useSnapshot = false; 
+            boolean useSnapshot = false;
             if (property.getAdditionalProperties() != null) {
                 version = (String) property.getAdditionalProperties().get(MavenConstants.NAME_USER_VERSION);
                 useSnapshot = property.getAdditionalProperties().containsKey(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
@@ -307,20 +307,19 @@ public class PomIdsHelper {
     }
 
     /**
-     * @return "<jobVersion>-<projectName>".
+     * @return "<version>".
      */
-    public static String getJobFeatureVersion(Property property, String bundleVersion) {
+    public static String getVersion(Property property, String bundleVersion) {
         String version = null;
         if (property != null) {
             boolean useSnapshot = false; 
             if (property.getAdditionalProperties() != null) {
                 version = (String) property.getAdditionalProperties().get(MavenConstants.NAME_USER_VERSION);
-//                APPINT-34581 - try to take cloud version if custom does not persist
-
                 useSnapshot = property.getAdditionalProperties().containsKey(MavenConstants.NAME_PUBLISH_AS_SNAPSHOT);
             }
             if(version == null) {
-                version = (String) property.getAdditionalProperties().get(MavenConstants.CLOUD_VERSION);
+//              APPINT-34581 - try to take cloud version if custom does not persist(CI cloud publish)
+            	version = (String) property.getAdditionalProperties().get(MavenConstants.CLOUD_VERSION);
             }
             if(version == null) {
                 version = bundleVersion;