Remove v from OSS Version

che-so · Oct 4, 2023 · 4d90652 · 4d90652
1 parent 30797ac
commit 4d90652
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/src/main/java/oss/fosslight/controller/ProjectController.java b/src/main/java/oss/fosslight/controller/ProjectController.java
@@ -1910,7 +1910,14 @@ private Map<String, Object> updateCopyConfirmStatus(HttpServletRequest req, Proj
 			ossComponents = (List<ProjectIdentification>) fromJson(mainDataString, collectionType2);
 
 			List<List<ProjectIdentification>> ossComponentsLicense = CommonFunction.setOssComponentLicense(ossComponents);
-
+			for(ProjectIdentification idx : ossComponents){
+				String ossVersion = idx.getOssVersion();
+				if (ossVersion.matches("[vV]\\.(\\d+).*") || ossVersion.matches("[vV](\\d+).*")) {
+					ossVersion = ossVersion.replaceAll("[vV]\\.", "").replaceAll("[vV]", "");
+					idx.setOssVersion(ossVersion);
+				}
+			}
+
 			Type collectionType4 = new TypeToken<List<Project>>() {
 			}.getType();
 			List<Project> binAddList = new ArrayList<Project>();
@@ -2176,7 +2183,15 @@ private Map<String, Object> updateCopyConfirmStatus(HttpServletRequest req, Proj
 		ossComponents = (List<ProjectIdentification>) fromJson(mainDataString, collectionType2);
 
 		List<List<ProjectIdentification>> ossComponentsLicense = CommonFunction.setOssComponentLicense(ossComponents);
-
+
+		for(ProjectIdentification idx : ossComponents){
+			String ossVersion = idx.getOssVersion();
+			if (ossVersion.matches("[vV]\\.(\\d+).*") || ossVersion.matches("[vV](\\d+).*")) {
+				ossVersion = ossVersion.replaceAll("[vV]\\.", "").replaceAll("[vV]", "");
+				idx.setOssVersion(ossVersion);
+			}
+		}
+
 		Type collectionType4 = new TypeToken<List<Project>>() {}.getType();
 		List<Project> srcAddList = new ArrayList<Project>();
 		srcAddList = (List<Project>) fromJson(srcAddListDataString, collectionType4);