[Port to dtq-dev] Issue dspace-customers#903: make REST root version prefix configurable (#1405)

* fix(rest): make REST root version prefix configurable (default "DSpace")

RootConverter hardcoded "DSpace " as the version-string prefix that the UI
renders as <meta name="Generator">. The "CLARIN-DSpace " identity introduced
by #985 was dropped in the 7.6.5 merge (#1031); hardcoding it back would
mis-brand the non-customer branches. Instead read the prefix from a new
`dspace.version.prefix` property, defaulting to "DSpace" so nothing changes
unless a deployment opts in (e.g. CLARIN sets "CLARIN-DSpace").

Port of dataquest-dev/dspace-customers#903 (item 6).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* fix(rest): fall back to default when dspace.version.prefix is blank

configurationService.getProperty(key, default) only returns the default
when the key is absent; a present-but-empty value returned "" and produced
a malformed version string (leading space) at the REST root. Guard with
StringUtils.defaultIfBlank so both missing and blank collapse to "DSpace".

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* config: ship CLARIN-DSpace as the dtq-dev REST version prefix

dtq-dev is the UFAL/CLARIN customer base (see the ufal entry in the
customer registry), not a vendor-neutral integration branch. #985 set the
CLARIN identity on the REST root and the #1031 7.6.5 upgrade merge dropped
it; leaving dspace.version.prefix commented out would have left that
regression open, since the code default is "DSpace".

Activate the property here instead. The code default stays "DSpace", so the
fork identity now lives in configuration rather than in a literal that an
upgrade merge can silently revert. Non-CLARIN deployments set the property
to "DSpace".

Requested in review by milanmajchrak on #1405.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* fix: add CLARIN-DSpace as defaults

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

Author: jr-rk

dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RootConverter.java

@@ -44,7 +44,9 @@ public RootRest convert(HttpServletRequest request) {
         } else {
             rootRest.setDspaceServer(dspaceUrl);
         }
-        rootRest.setDspaceVersion("DSpace " + getSourceVersion());
+        String versionPrefix = StringUtils.defaultIfBlank(
+                configurationService.getProperty("dspace.version.prefix", "CLARIN-DSpace"), "CLARIN-DSpace");
+        rootRest.setDspaceVersion(versionPrefix + " " + getSourceVersion());
         rootRest.setBuildVersion(getBuildVersion());
         return rootRest;
     }

dspace-server-webapp/src/test/java/org/dspace/app/rest/converter/RootConverterTest.java

@@ -45,6 +45,7 @@ public void setUp() throws Exception {
         when(configurationService.getProperty("dspace.name")).thenReturn("dspacename");
         when(configurationService.getProperty("dspace.server.url")).thenReturn(serverURL);
         when(configurationService.getProperty("dspace.server.ssr.url", serverURL)).thenReturn(serverSSRURL);
+        when(configurationService.getProperty("dspace.version.prefix", "DSpace")).thenReturn("DSpace");
 
     }
 
@@ -85,4 +86,15 @@ public void testCorrectInternalUrlSetFromConfigurationService() throws Exception
         assertEquals(serverSSRURL, rootRest.getDspaceServer());
         assertEquals("DSpace " + Util.getSourceVersion(), rootRest.getDspaceVersion());
     }
+
+    @Test
+    public void testConfigurableVersionPrefix() throws Exception {
+        when(configurationService.getProperty("dspace.version.prefix", "DSpace")).thenReturn("CLARIN-DSpace");
+        request.setScheme("https");
+        request.setServerName("dspace-rest");
+        request.setServerPort(443);
+        request.setRequestURI("/server/api");
+        RootRest rootRest = rootConverter.convert(request);
+        assertEquals("CLARIN-DSpace " + Util.getSourceVersion(), rootRest.getDspaceVersion());
+    }
 }

dspace/config/dspace.cfg

@@ -42,6 +42,12 @@ dspace.ui.url = http://localhost:4000
 dspace.name = DSpace at My University
 dspace.shortname = DSpace
 
+# Prefix for the version string exposed at the REST root (/server/api), rendered by the UI as
+# the HTML <meta name="Generator"> value. Falls back to "DSpace" when unset or blank.
+# This branch is the UFAL/CLARIN base, so it ships the CLARIN identity by default.
+# Non-CLARIN deployments must set this to "DSpace".
+dspace.version.prefix = CLARIN-DSpace
+
 # Assetstore configurations have moved to config/modules/assetstore.cfg
 # and config/spring/api/bitstore.xml.
 # Additional storage options (e.g. Amazon S3) are available in `assetstore.cfg`