Removed: method for removing 'v' from guides viersion in InAppNotificationsJsonPrinter

Author: GPortas

src/main/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinter.java

@@ -219,7 +219,7 @@ private void addCreateDatasetFields(final NullSafeJsonBuilder notificationJson,
 
     private void addGuidesFields(final NullSafeJsonBuilder notificationJson, String guidesSectionPath) {
         notificationJson.add(KEY_GUIDES_BASE_URL, systemConfig.getGuidesBaseUrl(false));
-        notificationJson.add(KEY_GUIDES_VERSION, getGuidesVersionFormattedString());
+        notificationJson.add(KEY_GUIDES_VERSION, systemConfig.getGuidesVersion());
 
         if (guidesSectionPath != null) {
             notificationJson.add(KEY_GUIDES_SECTION_PATH, guidesSectionPath);
@@ -260,12 +260,4 @@ private void addDatasetMentionedFields(final NullSafeJsonBuilder notificationJso
         addDatasetFields(notificationJson, userNotification);
         notificationJson.add(KEY_ADDITIONAL_INFO, userNotification.getAdditionalInfo());
     }
-
-    private String getGuidesVersionFormattedString() {
-        String guidesVersion = systemConfig.getGuidesVersion();
-        if (guidesVersion != null && guidesVersion.startsWith("v")) {
-            guidesVersion = guidesVersion.substring(1);
-        }
-        return guidesVersion;
-    }
 }

src/test/java/edu/harvard/iq/dataverse/util/json/InAppNotificationsJsonPrinterTest.java

@@ -151,7 +151,7 @@ public void testAddFieldsByType_createDv_dvHasOwner() {
 
         when(dataverseService.find(1L)).thenReturn(dataverse);
         when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
-        when(systemConfig.getGuidesVersion()).thenReturn("v1.0");
+        when(systemConfig.getGuidesVersion()).thenReturn("1.0");
 
         sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
 
@@ -177,7 +177,7 @@ public void testAddFieldsByType_createDv_dvHasNoOwner() {
 
         when(dataverseService.find(1L)).thenReturn(dataverse);
         when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
-        when(systemConfig.getGuidesVersion()).thenReturn("v1.0");
+        when(systemConfig.getGuidesVersion()).thenReturn("1.0");
 
         sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
 
@@ -195,7 +195,7 @@ public void testAddFieldsByType_createDv_objectDeleted() {
 
         when(dataverseService.find(1L)).thenReturn(null);
         when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
-        when(systemConfig.getGuidesVersion()).thenReturn("v1.0");
+        when(systemConfig.getGuidesVersion()).thenReturn("1.0");
 
         sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
 
@@ -279,7 +279,7 @@ public void testAddFieldsByType_createDs() {
         when(datasetVersionService.find(1L)).thenReturn(datasetVersion);
 
         when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
-        when(systemConfig.getGuidesVersion()).thenReturn("v1.0");
+        when(systemConfig.getGuidesVersion()).thenReturn("1.0");
 
         sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
 
@@ -404,7 +404,7 @@ public void testAddFieldsByType_createAcc() {
             mockedBrandingUtil.when(BrandingUtil::getInstallationBrandName).thenReturn("My Test Brand Name");
 
             when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
-            when(systemConfig.getGuidesVersion()).thenReturn("v1.0");
+            when(systemConfig.getGuidesVersion()).thenReturn("1.0");
 
             sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
 
@@ -433,7 +433,7 @@ public void testAddFieldsByType_ingestCompleted() {
         when(datasetService.find(1L)).thenReturn(dataset);
 
         when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
-        when(systemConfig.getGuidesVersion()).thenReturn("v1.0");
+        when(systemConfig.getGuidesVersion()).thenReturn("1.0");
 
         sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);
 
@@ -454,7 +454,7 @@ public void testAddFieldsByType_ingestCompleted_objectDeleted() {
         when(datasetService.find(1L)).thenReturn(null);
 
         when(systemConfig.getGuidesBaseUrl(false)).thenReturn("http://guides.dataverse.org");
-        when(systemConfig.getGuidesVersion()).thenReturn("v1.0");
+        when(systemConfig.getGuidesVersion()).thenReturn("1.0");
 
         sut.addFieldsByType(notificationJson, authenticatedUser, userNotification);