Adjust /{id} routes to return json format

src/main/java/eu/openaire/api/controllers/DataSourceController.java

@@ -47,7 +47,7 @@ public class DataSourceController
 			@ApiResponse(responseCode = "500", content = { @Content(schema = @Schema(implementation = ErrorResponse.class), mediaType = "application/json") })
 	})
 	@GetMapping(value = "/{id}")
-	public Object getById(@PathVariable @Parameter(description = "The OpenAIRE id of the data source") String id) {
+	public Datasource getById(@PathVariable @Parameter(description = "The OpenAIRE id of the data source") String id) {
 		return dataSourceService.getById(id);
 	}
 

src/main/java/eu/openaire/api/controllers/OrganizationController.java

@@ -47,7 +47,7 @@ public class OrganizationController
 			@ApiResponse(responseCode = "500", content = { @Content(schema = @Schema(implementation = ErrorResponse.class), mediaType = "application/json") })
 	})
 	@GetMapping(value = "/{id}")
-	public Object getById(@PathVariable @Parameter(description = "The OpenAIRE id of the project") String id) {
+	public Organization getById(@PathVariable @Parameter(description = "The OpenAIRE id of the project") String id) {
 		return organizationService.getById(id);
 	}
 

src/main/java/eu/openaire/api/controllers/ProjectController.java

@@ -47,7 +47,7 @@ public class ProjectController
         @ApiResponse(responseCode = "500", content = { @Content(schema = @Schema(implementation = ErrorResponse.class), mediaType = "application/json") })
     })
     @GetMapping(value = "/{id}")
-    public Object getById(@PathVariable @Parameter(description = "The OpenAIRE id of the project") String id) {
+    public Project getById(@PathVariable @Parameter(description = "The OpenAIRE id of the project") String id) {
         return projectService.getById(id);
     }
 

src/main/java/eu/openaire/api/controllers/ResearchProductsController.java

@@ -47,7 +47,7 @@ public class ResearchProductsController
 			@ApiResponse(responseCode = "500", content = { @Content(schema = @Schema(implementation = ErrorResponse.class), mediaType = "application/json") })
 	})
 	@GetMapping(value = "/{id}")
-	public Object getById(@PathVariable @Parameter(description = "The OpenAIRE id of the research product") String id) {
+	public GraphResult getById(@PathVariable @Parameter(description = "The OpenAIRE id of the research product") String id) {
 		return researchProductService.getById(id);
 	}
 
@@ -61,7 +61,7 @@ public class ResearchProductsController
 			@ApiResponse(responseCode = "500", content = { @Content(schema = @Schema(implementation = ErrorResponse.class), mediaType = "application/json") })
 	})
 	@GetMapping(value = "")
-	public Object search(@Valid @ParameterObject final ResearchProductsRequest request, BindingResult validationResult) {
+	public SearchResponse<GraphResult> search(@Valid @ParameterObject final ResearchProductsRequest request, BindingResult validationResult) {
 
 		if (validationResult.hasErrors()) {
 			throw new BadRequestException(RequestValidator.getErrorMessage(validationResult.getAllErrors()));

src/main/java/eu/openaire/api/mappers/response/ResponseResultsMapper.java

@@ -32,4 +32,18 @@ public class ResponseResultsMapper {
 				.map(mapFunction)
 				.collect(Collectors.toList());
 	}
+
+	public <T> T toSingleResult(String jsonPayload, Function<SolrRecord, T> mapFunction) throws RuntimeException {
+		try {
+
+			// Deserialize the JSON field to SolrRecord
+			SolrRecord solrRecord = objectMapper.readValue(jsonPayload, SolrRecord.class);
+
+			// Apply the mapFunction to transform SolrRecord to T
+			return mapFunction.apply(solrRecord);
+
+		} catch (JsonProcessingException e) {
+			throw new RuntimeException("Error deserializing JSON", e);
+		}
+	}
 }

src/main/java/eu/openaire/api/services/DataSourceService.java

@@ -16,7 +16,6 @@ import lombok.SneakyThrows;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrDocument;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -38,14 +37,14 @@ public class DataSourceService {
 	private final Logger log = LogManager.getLogger(this.getClass());
 
 	@SneakyThrows
-	public SolrDocument getById(String id) {
+	public Datasource getById(String id) {
 
 		var doc = solrRepository.getById(id);
 		if (doc == null) {
 			throw new NotFoundException("Data source with id: " + id + " not found");
 		}
 
-		return doc;
+		return responseResultsMapper.toSingleResult(doc.get("__json").toString(), datasourceMapper::toGraphDatasource);
 	}
 
 	@SneakyThrows

src/main/java/eu/openaire/api/services/OrganizationService.java

@@ -16,7 +16,6 @@ import lombok.SneakyThrows;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrDocument;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -38,14 +37,14 @@ public class OrganizationService {
 	private final Logger log = LogManager.getLogger(this.getClass());
 
 	@SneakyThrows
-	public SolrDocument getById(String id) {
+	public Organization getById(String id) {
 
 		var doc = solrRepository.getById(id);
 		if (doc == null) {
 			throw new NotFoundException("Organization with id: " + id + " not found");
 		}
 
-		return doc;
+		return responseResultsMapper.toSingleResult(doc.get("__json").toString(), organizationMapper::toGraphOrganization);
 	}
 
 	@SneakyThrows

src/main/java/eu/openaire/api/services/ProjectService.java

@@ -16,7 +16,6 @@ import lombok.SneakyThrows;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrDocument;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -38,14 +37,14 @@ public class ProjectService {
     private final Logger log = LogManager.getLogger(this.getClass());
 
     @SneakyThrows
-    public SolrDocument getById(String id) {
+    public Project getById(String id) {
 
         var doc = solrRepository.getById(id);
         if (doc == null) {
             throw new NotFoundException("Project with id: " + id + " not found");
         }
 
-        return doc;
+        return responseResultsMapper.toSingleResult(doc.get("__json").toString(), projectMapper::toGraphProject);
     }
 
     @SneakyThrows

src/main/java/eu/openaire/api/services/ResearchProductService.java

@@ -16,7 +16,6 @@ import lombok.SneakyThrows;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrDocument;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -38,14 +37,15 @@ public class ResearchProductService {
 	private final Logger log = LogManager.getLogger(this.getClass());
 
 	@SneakyThrows
-	public SolrDocument getById(String id) {
+	public GraphResult getById(String id) {
 
 		var doc = solrRepository.getById(id);
 		if (doc == null) {
 			throw new NotFoundException("Research product with id: " + id + " not found");
 		}
 
-		return doc;
+		return responseResultsMapper.toSingleResult(doc.get("__json").toString(), researchProductMapper::toGraphResult);
+
 	}
 
 	@SneakyThrows

src/main/java/eu/openaire/api/solr/SolrResponseBean.java

@@ -4,7 +4,7 @@ import lombok.Data;
 import org.apache.solr.client.solrj.beans.Field;
 
 @Data
-public class SolrResponseBean<T> {
+public class SolrResponseBean {
 
 	@Field("__json")
 	private String jsonField;