Merged in DSC-1304-expose-separate-dspace-and-cris-versions (pull req…

…uest DSpace#1208) DSC-1304 expose separate dspace and cris versions Approved-by: Andrea Bollini
4Science · Oct 30, 2023 · 1a9294a · 1a9294a
2 parents 744809c + a5c859e
commit 1a9294a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/core/CrisConstants.java b/dspace-api/src/main/java/org/dspace/core/CrisConstants.java
@@ -21,7 +21,7 @@ public class CrisConstants {
      * same number than the parent leading metadata
      */
     public static final String PLACEHOLDER_PARENT_METADATA_VALUE = "#PLACEHOLDER_PARENT_METADATA_VALUE#";
-
+    public static final String DSPACE_BASE_VERSION = "DSpace 7.5";
     public static final MetadataFieldName MD_ENTITY_TYPE = new MetadataFieldName("dspace", "entity", "type");
     public static final MetadataFieldName MD_SUBMISSION_TYPE = new MetadataFieldName("cris", "submission",
             "definition");

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RootConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RootConverter.java
@@ -10,6 +10,7 @@
 import static org.dspace.app.util.Util.getSourceVersion;
 
 import org.dspace.app.rest.model.RootRest;
+import org.dspace.core.CrisConstants;
 import org.dspace.services.ConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -28,7 +29,8 @@ public RootRest convert() {
         rootRest.setDspaceName(configurationService.getProperty("dspace.name"));
         rootRest.setDspaceUI(configurationService.getProperty("dspace.ui.url"));
         rootRest.setDspaceServer(configurationService.getProperty("dspace.server.url"));
-        rootRest.setDspaceVersion("DSpace " + getSourceVersion());
+        rootRest.setDspaceVersion(CrisConstants.DSPACE_BASE_VERSION);
+        rootRest.setCrisVersion(getSourceVersion());
         return rootRest;
     }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RootRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RootRest.java
@@ -21,6 +21,7 @@ public class RootRest extends RestAddressableModel {
     private String dspaceName;
     private String dspaceServer;
     private String dspaceVersion;
+    private String crisVersion;
 
     public String getCategory() {
         return CATEGORY;
@@ -67,6 +68,14 @@ public void setDspaceVersion(String dspaceVersion) {
         this.dspaceVersion = dspaceVersion;
     }
 
+    public String getCrisVersion() {
+        return crisVersion;
+    }
+
+    public void setCrisVersion(String crisVersion) {
+        this.crisVersion = crisVersion;
+    }
+
     @Override
     public boolean equals(Object object) {
         return (object instanceof RootRest &&
@@ -76,6 +85,7 @@ public boolean equals(Object object) {
                                .append(this.getDspaceUI(), ((RootRest) object).getDspaceUI())
                                .append(this.getDspaceName(), ((RootRest) object).getDspaceName())
                                .append(this.getDspaceServer(), ((RootRest) object).getDspaceServer())
+                               .append(this.getCrisVersion(), ((RootRest)object).getCrisVersion())
                                .isEquals());
     }
 
@@ -88,6 +98,7 @@ public int hashCode() {
             .append(this.getDspaceName())
             .append(this.getDspaceUI())
             .append(this.getDspaceServer())
+            .append(this.getCrisVersion())
             .toHashCode();
     }
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/converter/RootConverterTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/converter/RootConverterTest.java
@@ -13,6 +13,7 @@
 
 import org.dspace.app.rest.model.RootRest;
 import org.dspace.app.util.Util;
+import org.dspace.core.CrisConstants;
 import org.dspace.services.ConfigurationService;
 import org.junit.Before;
 import org.junit.Test;
@@ -52,7 +53,8 @@ public void testCorrectPropertiesSetFromConfigurationService() throws Exception
         assertEquals("dspaceurl", rootRest.getDspaceUI());
         assertEquals("dspacename", rootRest.getDspaceName());
         assertEquals(restUrl, rootRest.getDspaceServer());
-        assertEquals("DSpace " + Util.getSourceVersion(), rootRest.getDspaceVersion());
+        assertEquals(CrisConstants.DSPACE_BASE_VERSION, rootRest.getDspaceVersion());
+        assertEquals(Util.getSourceVersion(), rootRest.getCrisVersion());
     }
 
     @Test