Unify functions to strip prefix and suffix (#1266) (#2146)

grasci-arm · edriouk · web-flow · commit 7f1f9119c06c · 2025-07-15T11:42:43.000+02:00
ExtractPrefix, ExtractSuffix, StripPrefix, StripSuffix methods
Same is in TypeScript

Replace RemoveSuffixByString with ExtractPrefix
Replace RemovePrefixByString with StripPrefix

Co-authored-by: Evgueni Driouk &lt;edriouk@arm.com&gt;
diff --git a/libs/rtemodel/include/RteBoard.h b/libs/rtemodel/include/RteBoard.h
@@ -240,7 +240,7 @@ class BoardLessNoCase
 {
 public:
   bool operator()(const std::string& a, const std::string& b) const {
-    return AlnumCmp::CompareLen(RteUtils::RemovePrefixByString(a, "::"), RteUtils::RemovePrefixByString(b, "::"), false) < 0;
+    return AlnumCmp::CompareLen(RteUtils::StripPrefix(a, "::"), RteUtils::StripPrefix(b, "::"), false) < 0;
   }
 };
 /**
diff --git a/libs/rtemodel/src/RteItem.cpp b/libs/rtemodel/src/RteItem.cpp
@@ -248,10 +248,10 @@ void RteItem::SetAttributesFomComponentId(const std::string& componentId)
   }
   string id = componentId;
   if (componentId.find(RteConstants::SUFFIX_CVENDOR) != string::npos) {
-    string vendor = RteUtils::RemoveSuffixByString(id, RteConstants::SUFFIX_CVENDOR);
+    string vendor = RteUtils::ExtractPrefix(id, RteConstants::SUFFIX_CVENDOR);
     AddAttribute("Cvendor", vendor);
     SetAttribute("explicitVendor", true);
-    id = RteUtils::RemovePrefixByString(componentId, RteConstants::SUFFIX_CVENDOR);
+    id = RteUtils::StripPrefix(componentId, RteConstants::SUFFIX_CVENDOR);
   }
   auto explicitVersion = RteUtils::GetSuffix(id, RteConstants::PREFIX_CVERSION_CHAR, true);
   AddAttribute("explicitVersion", explicitVersion);
diff --git a/libs/rtemodel/src/RtePackage.cpp b/libs/rtemodel/src/RtePackage.cpp
@@ -209,7 +209,7 @@ string RtePackage::ReleaseIdFromId(const string& id)
 
 string RtePackage::VendorFromId(const string& id)
 {
-  return RteUtils::RemoveSuffixByString(id, RteConstants::SUFFIX_PACK_VENDOR);
+  return RteUtils::ExtractPrefix(id, RteConstants::SUFFIX_PACK_VENDOR);
 }
 
 string RtePackage::NameFromId(const string& id)
diff --git a/libs/rtemodel/src/RteProject.cpp b/libs/rtemodel/src/RteProject.cpp
@@ -840,7 +840,7 @@ bool RteProject::Apply()
           ci->AssignAttribute("explicitVersion", *a);
           string ymlID = RteUtils::GetPrefix(ci->GetID(), RteConstants::PREFIX_CVERSION_CHAR);
           if(!a->GetAttributeAsBool("explicitVendor")) {
-            ymlID = RteUtils::RemovePrefixByString(ymlID, RteConstants::SUFFIX_CVENDOR);
+            ymlID = RteUtils::StripPrefix(ymlID, RteConstants::SUFFIX_CVENDOR);
           }
           ymlID += a->GetAttribute("explicitVersion");
           ci->AddAttribute("ymlID", ymlID);
diff --git a/libs/rteutils/include/RteUtils.h b/libs/rteutils/include/RteUtils.h
@@ -50,19 +50,35 @@ class RteUtils
   */
   static int    GetSuffixAsInt(const std::string& s, char delimiter = ':');
   /**
-   * @brief determine string after a delimiter
+   * @brief Remove string prefix before delimiter
    * @param s string containing delimiter
    * @param delimiter string delimiter to look for
-   * @return return string after delimiter
+   * @return return string after delimiter, entire string if no delimiter found
   */
-  static std::string RemovePrefixByString(const std::string& s, const char* delimiter = ":");
+  static std::string StripPrefix(const std::string& s, const char* delimiter = ":");
   /**
-   * @brief determine string ahead of a delimiter
+   * @brief Remove string suffix after delimiter
    * @param s string containing delimiter
    * @param delimiter string delimiter to look for
-   * @return return string ahead of delimiter
+   * @return return string before of delimiter, entire string if no delimiter found
   */
-  static std::string RemoveSuffixByString(const std::string& s, const char* delimiter = ":");
+  static std::string StripSuffix(const std::string& s, const char* delimiter = ":");
+  /**
+   * @brief Extract string prefix before delimiter
+   * @param s string containing delimiter
+   * @param delimiter string delimiter to look for
+   * @param withDelimiter true if returned string should contain delimiter, otherwise false
+   * @return return string after delimiter, empty if no delimiter found
+  */
+  static std::string ExtractPrefix(const std::string& s, const char* delimiter = ":", bool withDelimiter = false);
+  /**
+   * @brief Extract string suffix after delimiter
+   * @param s string containing delimiter
+   * @param delimiter string delimiter to look for
+   * @param withDelimiter true if returned string should contain delimiter, otherwise false
+   * @return return string after delimiter, empty if no delimiter is found,
+  */
+  static std::string ExtractSuffix(const std::string& s, const char* delimiter = ":", bool withDelimiter = false);
   /**
    * @brief determine number of delimiters found in the string
    * @param s string containing delimiter(s)
diff --git a/libs/rteutils/src/RteUtils.cpp b/libs/rteutils/src/RteUtils.cpp
@@ -69,34 +69,62 @@ int RteUtils::GetSuffixAsInt(const string& value, char delimiter)
   return stoi(s);
 }
 
-string RteUtils::RemovePrefixByString(const string& s, const char* delimiter)
+string RteUtils::StripPrefix(const string& s, const char* delimiter)
 {
+  if(!delimiter) {
+    return s;
+  }
   size_t            len = strlen(delimiter);
   string::size_type pos = s.find(delimiter);
-  if (pos == string::npos)
+  if(pos == string::npos) {
     return s;
-
+  }
   return s.substr(pos + len);
 }
 
-string RteUtils::RemoveSuffixByString(const string& s, const char* delimiter)
+string RteUtils::StripSuffix(const string& s, const char* delimiter)
 {
-  const char* cpos = strstr(s.c_str(), delimiter);
-  const char* pos;
-  if (cpos == 0) {
+  if(!delimiter) {
+    return s;
+  }
+  string::size_type pos = s.find(delimiter);
+  if(pos == string::npos) {
+    return s;
+  }
+  return s.substr(0, pos);
+}
+
+string RteUtils::ExtractPrefix(const string& s, const char* delimiter, bool withDelimiter)
+{
+  if(!delimiter) {
     return EMPTY_STRING;
   }
-  do {
-    pos = cpos;
-    cpos = strstr(cpos + 1, delimiter);
-  } while (cpos);
-  size_t cnt = pos - s.c_str();
-  if(cnt > 0 ) {
-    return s.substr(0, cnt);
+  string::size_type pos = s.find(delimiter);
+  if(pos == string::npos) {
+    return EMPTY_STRING;
+  }
+  if(withDelimiter) {
+    pos += strlen(delimiter);
+  }
+  return s.substr(0, pos);
+}
+
+string RteUtils::ExtractSuffix(const string& s, const char* delimiter, bool withDelimiter)
+{
+  if(!delimiter) {
+    return EMPTY_STRING;
+  }
+  string::size_type pos = s.find(delimiter);
+  if(pos == string::npos) {
+    return EMPTY_STRING;
   }
-  return EMPTY_STRING;
+  if(!withDelimiter) {
+    pos += strlen(delimiter);
+  }
+  return s.substr(pos);
 }
 
+
 int RteUtils::CountDelimiters(const string& s, const char* delimiter)
 {
   int dlen, count = 0;
diff --git a/libs/rteutils/src/VersionCmp.cpp b/libs/rteutils/src/VersionCmp.cpp
@@ -313,9 +313,9 @@ const std::string VersionCmp::GetMatchingVersion(const std::string& filter,
   }
   else {
     VersionCmp::MatchMode mode = VersionCmp::MatchModeFromVersionString(filter);
-    string filterVersion = RteUtils::RemovePrefixByString(filter, PREFIX_VERSION);
+    string filterVersion = RteUtils::StripPrefix(filter, PREFIX_VERSION);
     if (mode == MatchMode::HIGHER_OR_EQUAL) {
-      filterVersion = RteUtils::RemovePrefixByString(filterVersion, HIGHER_OR_EQUAL_OPERATOR);
+      filterVersion = RteUtils::StripPrefix(filterVersion, HIGHER_OR_EQUAL_OPERATOR);
     }
     for (auto& version : availableVersions) {
       int result = VersionCmp::Compare(version, filterVersion, false);
diff --git a/libs/rteutils/test/src/RteUtilsTest.cpp b/libs/rteutils/test/src/RteUtilsTest.cpp
@@ -67,6 +67,7 @@ TEST(RteUtilsTest, EqualNoCase) {
 
 TEST(RteUtilsTest, GetPrefix) {
 
+  EXPECT_EQ(RteUtils::GetPrefix("prefix"), "prefix");
   EXPECT_EQ(RteUtils::GetPrefix("prefix:suffix"), "prefix");
   EXPECT_EQ(RteUtils::GetPrefix("prefix:suffix", '-'),"prefix:suffix");
   EXPECT_EQ(RteUtils::GetPrefix("prefix:suffix",':', true) , "prefix:");
@@ -78,6 +79,10 @@ TEST(RteUtilsTest, GetPrefix) {
 
 TEST(RteUtilsTest, GetSuffix) {
 
+  EXPECT_TRUE(RteUtils::GetSuffix("").empty());
+  EXPECT_TRUE(RteUtils::GetSuffix(":").empty());
+  EXPECT_TRUE(RteUtils::GetSuffix("prefix").empty());
+
   EXPECT_EQ(RteUtils::GetSuffix("prefix:suffix"), "suffix");
   EXPECT_TRUE(RteUtils::GetSuffix("prefix:suffix", '-').empty());
   EXPECT_EQ(RteUtils::GetSuffix("prefix:suffix", ':', true), ":suffix");
@@ -86,24 +91,63 @@ TEST(RteUtilsTest, GetSuffix) {
   EXPECT_EQ(RteUtils::GetSuffix("prefix-suffix", '-'), "suffix");
 }
 
-TEST(RteUtilsTest, RemoveSuffixByString) {
+TEST(RteUtilsTest, StripSuffix) {
+  EXPECT_EQ(RteUtils::StripSuffix("prefix:", nullptr), "prefix:");
+  EXPECT_TRUE(RteUtils::StripSuffix("").empty());
+  EXPECT_TRUE(RteUtils::StripSuffix(":suffix").empty());
+  EXPECT_EQ(RteUtils::StripSuffix("prefix:"), "prefix");
+  EXPECT_EQ(RteUtils::StripSuffix("prefix"), "prefix");
+
+  EXPECT_EQ(RteUtils::StripSuffix("prefix:suffix"), "prefix");
+  EXPECT_EQ(RteUtils::StripSuffix("prefix:suffix", "-"), "prefix:suffix");
+  EXPECT_EQ(RteUtils::StripSuffix("prefix::suffix", "::"), "prefix");
+
+  EXPECT_EQ(RteUtils::StripSuffix("prefix-suffix"), "prefix-suffix");
+  EXPECT_EQ(RteUtils::StripSuffix("prefix-suffix", "-"), "prefix");
+}
+
+TEST(RteUtilsTest, StripPrefix) {
+
+  EXPECT_EQ(RteUtils::StripSuffix(":suffix", nullptr), ":suffix");
+  EXPECT_EQ(RteUtils::StripPrefix("suffix"), "suffix");
+  EXPECT_EQ(RteUtils::StripPrefix("prefix:suffix"), "suffix");
+  EXPECT_EQ(RteUtils::StripPrefix(":suffix"), "suffix");
+  EXPECT_EQ(RteUtils::StripPrefix("prefix:suffix", "-"), "prefix:suffix");
+  EXPECT_EQ(RteUtils::StripPrefix("prefix::suffix", "::"), "suffix");
+
+  EXPECT_EQ(RteUtils::StripPrefix("prefix-suffix"), "prefix-suffix");
+  EXPECT_EQ(RteUtils::StripPrefix("prefix-suffix", "-"), "suffix");
+}
+
+TEST(RteUtilsTest, ExtractPrefix) {
+  EXPECT_TRUE(RteUtils::ExtractPrefix("prefix:", nullptr).empty());
+  EXPECT_TRUE(RteUtils::ExtractPrefix("").empty());
+  EXPECT_TRUE(RteUtils::ExtractPrefix("suffix").empty());
+  EXPECT_TRUE(RteUtils::ExtractPrefix(":suffix").empty());
+  EXPECT_EQ(RteUtils::ExtractPrefix("prefix:"), "prefix");
 
-  EXPECT_EQ(RteUtils::RemoveSuffixByString("prefix:suffix"), "prefix");
-  EXPECT_TRUE(RteUtils::RemoveSuffixByString("prefix:suffix", "-").empty());
-  EXPECT_EQ(RteUtils::RemoveSuffixByString("prefix::suffix", "::"), "prefix");
+  EXPECT_EQ(RteUtils::ExtractPrefix("prefix:suffix"), "prefix");
+  EXPECT_EQ(RteUtils::ExtractPrefix(":suffix", ":", true), ":");
+  EXPECT_TRUE(RteUtils::ExtractPrefix("prefix:suffix", "-").empty());
+  EXPECT_EQ(RteUtils::ExtractPrefix("prefix::suffix", "::"), "prefix");
+  EXPECT_EQ(RteUtils::ExtractPrefix("prefix::suffix", "::", true), "prefix::");
 
-  EXPECT_TRUE(RteUtils::RemoveSuffixByString("prefix-suffix").empty());
-  EXPECT_EQ(RteUtils::RemoveSuffixByString("prefix-suffix", "-"), "prefix");
+  EXPECT_TRUE(RteUtils::ExtractPrefix("prefix-suffix").empty());
+  EXPECT_EQ(RteUtils::ExtractPrefix("prefix-suffix", "-"), "prefix");
 }
 
-TEST(RteUtilsTest, RemovePrefixByString) {
+TEST(RteUtilsTest, ExtractSuffix) {
+  EXPECT_TRUE(RteUtils::ExtractSuffix(":suffix", nullptr).empty());
+  EXPECT_TRUE(RteUtils::ExtractSuffix("").empty());
+  EXPECT_TRUE(RteUtils::ExtractSuffix(":").empty());
+  EXPECT_TRUE(RteUtils::ExtractSuffix("prefix").empty());
 
-  EXPECT_EQ(RteUtils::RemovePrefixByString("prefix:suffix"), "suffix");
-  EXPECT_EQ(RteUtils::RemovePrefixByString("prefix:suffix", "-"), "prefix:suffix");
-  EXPECT_EQ(RteUtils::RemovePrefixByString("prefix::suffix", "::"), "suffix");
+  EXPECT_EQ(RteUtils::ExtractSuffix("prefix:suffix"), "suffix");
+  EXPECT_TRUE(RteUtils::ExtractSuffix("prefix:suffix", "-").empty());
+  EXPECT_EQ(RteUtils::ExtractSuffix("prefix:suffix", ":", true), ":suffix");
 
-  EXPECT_EQ(RteUtils::RemovePrefixByString("prefix-suffix"), "prefix-suffix");
-  EXPECT_EQ(RteUtils::RemovePrefixByString("prefix-suffix", "-"), "suffix");
+  EXPECT_TRUE(RteUtils::ExtractSuffix("prefix-suffix").empty());
+  EXPECT_EQ(RteUtils::ExtractSuffix("prefix-suffix", "-"), "suffix");
 }
 
 TEST(RteUtilsTest, ExtractFileExtension) {
diff --git a/tools/projmgr/src/ProjMgrUtils.cpp b/tools/projmgr/src/ProjMgrUtils.cpp
@@ -244,8 +244,8 @@ vector<string> ProjMgrUtils::GetFilteredContexts(
 bool ProjMgrUtils::ConvertToPackInfo(const string& packId, PackInfo& packInfo) {
   string packInfoStr = packId;
   if (packInfoStr.find("::") != string::npos) {
-    packInfo.vendor = RteUtils::RemoveSuffixByString(packInfoStr, "::");
-    packInfoStr = RteUtils::RemovePrefixByString(packInfoStr, "::");
+    packInfo.vendor = RteUtils::ExtractPrefix(packInfoStr, "::");
+    packInfoStr = RteUtils::StripPrefix(packInfoStr, "::");
     packInfo.name   = RteUtils::GetPrefix(packInfoStr, '@');
   } else {
     packInfo.vendor = RteUtils::GetPrefix(packInfoStr, '@');
@@ -305,15 +305,15 @@ string ProjMgrUtils::ConvertToVersionRange(const string& version) {
   if (!versionRange.empty()) {
     if (versionRange.find(HIGHER_OR_EQUAL_OPERATOR) != string::npos) {
       // Minimum version
-      versionRange = RteUtils::RemovePrefixByString(versionRange, HIGHER_OR_EQUAL_OPERATOR);
+      versionRange = RteUtils::StripPrefix(versionRange, HIGHER_OR_EQUAL_OPERATOR);
     } else if (versionRange.find(TILDE_OPERATOR) != string::npos) {
       // Equivalent version
-      versionRange = RteUtils::RemovePrefixByString(versionRange, TILDE_OPERATOR);
+      versionRange = RteUtils::StripPrefix(versionRange, TILDE_OPERATOR);
       SemVer semVer = GetSemVer(versionRange);
       versionRange = versionRange + ":" + to_string(semVer.major) + "." + to_string(semVer.minor + 1) + ".0-0";
     } else if (versionRange.find(CARET_OPERATOR) != string::npos) {
       // Compatible version
-      versionRange = RteUtils::RemovePrefixByString(versionRange, CARET_OPERATOR);
+      versionRange = RteUtils::StripPrefix(versionRange, CARET_OPERATOR);
       SemVer semVer = GetSemVer(versionRange);
       versionRange = versionRange + ":" + to_string(semVer.major + 1) + ".0.0-0";
     } else {
diff --git a/tools/projmgr/src/ProjMgrWorker.cpp b/tools/projmgr/src/ProjMgrWorker.cpp
@@ -671,8 +671,8 @@ bool ProjMgrWorker::SetTargetAttributes(ContextItem& context, map<string, string
 void ProjMgrWorker::GetDeviceItem(const std::string& element, DeviceItem& device) const {
   string deviceInfoStr = element;
   if (!element.empty()) {
-    device.vendor = RteUtils::RemoveSuffixByString(deviceInfoStr, "::");
-    deviceInfoStr = RteUtils::RemovePrefixByString(deviceInfoStr, "::");
+    device.vendor = RteUtils::ExtractPrefix(deviceInfoStr, "::");
+    deviceInfoStr = RteUtils::StripPrefix(deviceInfoStr, "::");
     device.name  = RteUtils::GetPrefix(deviceInfoStr);
     device.pname = RteUtils::GetSuffix(deviceInfoStr);
   }
@@ -681,8 +681,8 @@ void ProjMgrWorker::GetDeviceItem(const std::string& element, DeviceItem& device
 void ProjMgrWorker::GetBoardItem(const std::string& element, BoardItem& board) const {
   string boardId = element;
   if (!boardId.empty()) {
-    board.vendor = RteUtils::RemoveSuffixByString(boardId, "::");
-    boardId = RteUtils::RemovePrefixByString(boardId, "::");
+    board.vendor = RteUtils::ExtractPrefix(boardId, "::");
+    boardId = RteUtils::StripPrefix(boardId, "::");
     board.name = RteUtils::GetPrefix(boardId);
     board.revision = RteUtils::GetSuffix(boardId);
   }
@@ -1671,7 +1671,7 @@ bool ProjMgrWorker::AddPackRequirements(ContextItem& context, const vector<PackI
       // Store specified pack metadata
       const auto& specifiedMetadata = RteUtils::GetSuffix(packageEntry.pack, '+');
       if (!specifiedMetadata.empty()) {
-        m_packMetadata[RteUtils::RemoveSuffixByString(packageEntry.pack, "+")] = specifiedMetadata;
+        m_packMetadata[RteUtils::ExtractPrefix(packageEntry.pack, "+")] = specifiedMetadata;
       }
       // System wide package
       vector<string> matchedPackIds = FindMatchingPackIdsInCbuildPack(packageEntry, resolvedPacks);
@@ -2044,7 +2044,7 @@ RteComponent* ProjMgrWorker::ResolveComponent(RteComponentInstance* ci, ContextI
   if (!freeText) {
     // Check required identifier mandatory fields
     string requiredComponentId = RteUtils::GetPrefix(
-      RteUtils::RemovePrefixByString(item.component, RteConstants::SUFFIX_CVENDOR),
+      RteUtils::StripPrefix(item.component, RteConstants::SUFFIX_CVENDOR),
       RteConstants::PREFIX_CVERSION_CHAR);
     for (const auto& [id, component] : filteredComponents) {
       // Get component id without vendor and version
@@ -4372,8 +4372,8 @@ bool ProjMgrWorker::ListLayers(vector<string>& layers, const string& clayerSearc
 ToolchainItem ProjMgrWorker::GetToolchain(const string& compiler) {
   ToolchainItem toolchain;
   if (compiler.find("@") != string::npos) {
-    toolchain.name = RteUtils::RemoveSuffixByString(compiler, "@");
-    toolchain.required = RteUtils::RemovePrefixByString(compiler, "@");
+    toolchain.name = RteUtils::ExtractPrefix(compiler, "@");
+    toolchain.required = RteUtils::StripPrefix(compiler, "@");
     if (toolchain.required.find(">=") != string::npos) {
       // minimum version
       toolchain.range = toolchain.required.substr(2);
diff --git a/tools/projmgr/src/ProjMgrYamlParser.cpp b/tools/projmgr/src/ProjMgrYamlParser.cpp
@@ -57,7 +57,7 @@ bool ProjMgrYamlParser::ParseCdefault(const string& input,
 bool ProjMgrYamlParser::ParseCsolution(const string& input,
   CsolutionItem& csolution, bool checkSchema, bool frozenPacks) {
 
-  string cbuildPackFile = RteUtils::RemoveSuffixByString(input, ".csolution.yml") + ".cbuild-pack.yml";
+  string cbuildPackFile = RteUtils::ExtractPrefix(input, ".csolution.yml") + ".cbuild-pack.yml";
   if (fs::exists(cbuildPackFile)) {
     if (!ParseCbuildPack(cbuildPackFile, csolution.cbuildPack, checkSchema)) {
       return false;
@@ -1009,7 +1009,7 @@ bool ProjMgrYamlParser::ParseTargetType(const YAML::Node& parent, const string&
     ParseString(parent, item.first, item.second);
   }
 
-  // Throw warning in case board or device name are set in *.cproject.yml or *.clayer.yml 
+  // Throw warning in case board or device name are set in *.cproject.yml or *.clayer.yml
   if (regex_match(file, regex(".*\\.(cproject|clayer)\\.(yml|yaml)"))) {
     for (const auto& [key, value] : targetChildren) {
       if (!value.empty()) {
diff --git a/tools/projmgr/test/src/ProjMgrRpcTests.cpp b/tools/projmgr/test/src/ProjMgrRpcTests.cpp
diff --git a/tools/projmgr/test/src/ProjMgrUnitTests.cpp b/tools/projmgr/test/src/ProjMgrUnitTests.cpp

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ class BoardLessNoCase`
`240`	`240`	`{`
`241`	`241`	`public:`
`242`	`242`	`bool operator()(const std::string& a, const std::string& b) const {`
`243`		`- return AlnumCmp::CompareLen(RteUtils::RemovePrefixByString(a, "::"), RteUtils::RemovePrefixByString(b, "::"), false) < 0;`
	`243`	`+ return AlnumCmp::CompareLen(RteUtils::StripPrefix(a, "::"), RteUtils::StripPrefix(b, "::"), false) < 0;`
`244`	`244`	`}`
`245`	`245`	`};`
`246`	`246`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -248,10 +248,10 @@ void RteItem::SetAttributesFomComponentId(const std::string& componentId)`
`248`	`248`	`}`
`249`	`249`	`string id = componentId;`
`250`	`250`	`if (componentId.find(RteConstants::SUFFIX_CVENDOR) != string::npos) {`
`251`		`- string vendor = RteUtils::RemoveSuffixByString(id, RteConstants::SUFFIX_CVENDOR);`
	`251`	`+ string vendor = RteUtils::ExtractPrefix(id, RteConstants::SUFFIX_CVENDOR);`
`252`	`252`	`AddAttribute("Cvendor", vendor);`
`253`	`253`	`SetAttribute("explicitVendor", true);`
`254`		`- id = RteUtils::RemovePrefixByString(componentId, RteConstants::SUFFIX_CVENDOR);`
	`254`	`+ id = RteUtils::StripPrefix(componentId, RteConstants::SUFFIX_CVENDOR);`
`255`	`255`	`}`
`256`	`256`	`auto explicitVersion = RteUtils::GetSuffix(id, RteConstants::PREFIX_CVERSION_CHAR, true);`
`257`	`257`	`AddAttribute("explicitVersion", explicitVersion);`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ string RtePackage::ReleaseIdFromId(const string& id)`
`209`	`209`
`210`	`210`	`string RtePackage::VendorFromId(const string& id)`
`211`	`211`	`{`
`212`		`- return RteUtils::RemoveSuffixByString(id, RteConstants::SUFFIX_PACK_VENDOR);`
	`212`	`+ return RteUtils::ExtractPrefix(id, RteConstants::SUFFIX_PACK_VENDOR);`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`string RtePackage::NameFromId(const string& id)`
Original file line number	Diff line number	Diff line change
`@@ -840,7 +840,7 @@ bool RteProject::Apply()`
`840`	`840`	`ci->AssignAttribute("explicitVersion", *a);`
`841`	`841`	`string ymlID = RteUtils::GetPrefix(ci->GetID(), RteConstants::PREFIX_CVERSION_CHAR);`
`842`	`842`	`if(!a->GetAttributeAsBool("explicitVendor")) {`
`843`		`- ymlID = RteUtils::RemovePrefixByString(ymlID, RteConstants::SUFFIX_CVENDOR);`
	`843`	`+ ymlID = RteUtils::StripPrefix(ymlID, RteConstants::SUFFIX_CVENDOR);`
`844`	`844`	`}`
`845`	`845`	`ymlID += a->GetAttribute("explicitVersion");`
`846`	`846`	`ci->AddAttribute("ymlID", ymlID);`
Original file line number	Diff line number	Diff line change
`@@ -313,9 +313,9 @@ const std::string VersionCmp::GetMatchingVersion(const std::string& filter,`
`313`	`313`	`}`
`314`	`314`	`else {`
`315`	`315`	`VersionCmp::MatchMode mode = VersionCmp::MatchModeFromVersionString(filter);`
`316`		`- string filterVersion = RteUtils::RemovePrefixByString(filter, PREFIX_VERSION);`
	`316`	`+ string filterVersion = RteUtils::StripPrefix(filter, PREFIX_VERSION);`
`317`	`317`	`if (mode == MatchMode::HIGHER_OR_EQUAL) {`
`318`		`- filterVersion = RteUtils::RemovePrefixByString(filterVersion, HIGHER_OR_EQUAL_OPERATOR);`
	`318`	`+ filterVersion = RteUtils::StripPrefix(filterVersion, HIGHER_OR_EQUAL_OPERATOR);`
`319`	`319`	`}`
`320`	`320`	`for (auto& version : availableVersions) {`
`321`	`321`	`int result = VersionCmp::Compare(version, filterVersion, false);`