fix: always auto generate URI based on incoming request

module-core/src/main/java/io/goobi/vocabulary/service/rdf/RDFMapperImpl.java

@@ -22,10 +22,11 @@
 import org.apache.jena.vocabulary.RDF;
 import org.apache.jena.vocabulary.SKOS;
 import org.apache.jena.vocabulary.XSD;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import org.springframework.web.util.UriComponents;
 
 import java.io.StringWriter;
 import java.lang.reflect.Method;
@@ -36,12 +37,6 @@
 
 @Service
 public class RDFMapperImpl implements RDFMapper {
-    @Value("${vocabulary-server.base-url}")
-    private String host;
-
-    @Value("${server.port}")
-    private int port;
-
     public static final RDFFormat RDF_XML_SYNTAX = RDFFormat.RDFXML;
     public static final RDFFormat RDF_TURTLE_SYNTAX = RDFFormat.TURTLE_BLOCKS;
 
@@ -53,15 +48,24 @@ private <T> String transform(T entity, EntityToModelMappingFunction<T> function,
 
     private String generateURIForId(Class<?> clazz, long id) {
         try {
+            String baseUrl = extractBaseURI();
             String classRoute = extractClassEndpoint(clazz);
             String methodRoute = extractMethodEndpoint(clazz.getMethod("one", long.class));
             String endpoint = classRoute + methodRoute.replace("{id}", Long.toString(id));
-            return host + ':' + port + endpoint;
+            return baseUrl + endpoint;
         } catch (NoSuchMethodException e) {
             throw new MappingException(clazz, String.class, e);
         }
     }
 
+    private String extractBaseURI() {
+        UriComponents uriComponents = ServletUriComponentsBuilder.fromCurrentRequest().build();
+        String scheme = uriComponents.getScheme();
+        String host = uriComponents.getHost();
+        String port = String.valueOf(uriComponents.getPort());
+        return scheme + "://" + host + ':' + port;
+    }
+
     private static String extractClassEndpoint(Class<?> clazz) throws NoSuchMethodException {
         String[] values = clazz.getAnnotation(RequestMapping.class).value();
         assert (values.length == 1);

module-core/src/main/resources/application.properties

@@ -7,8 +7,6 @@
 server.address=127.0.0.1
 
 # Basic configuration
-# The base url of the vocabulary server (which depends on external factors), it is used it generate valid API reference links
-vocabulary-server.base-url=http://localhost
 # The port the vocabulary server should listen on
 server.port=8081
 # The name of the application, can be customized but shouldn't affect anything