Review RepresentationController and RepresentationService

Author: hmiguim

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/RepresentationController.java

@@ -6,11 +6,7 @@
 
 import org.roda.core.RodaCoreFactory;
 import org.roda.core.data.common.RodaConstants;
-import org.roda.core.data.exceptions.AuthorizationDeniedException;
-import org.roda.core.data.exceptions.GenericException;
-import org.roda.core.data.exceptions.NotFoundException;
 import org.roda.core.data.exceptions.RODAException;
-import org.roda.core.data.exceptions.RequestNotValidException;
 import org.roda.core.data.v2.generics.LongResponse;
 import org.roda.core.data.v2.generics.select.SelectedItemsRequest;
 import org.roda.core.data.v2.index.CountRequest;
@@ -30,7 +26,6 @@
 import org.roda.core.data.v2.ip.IndexedRepresentation;
 import org.roda.core.data.v2.ip.Representation;
 import org.roda.core.data.v2.jobs.Job;
-import org.roda.core.data.v2.log.LogEntryState;
 import org.roda.core.data.v2.representation.ChangeRepresentationStatesRequest;
 import org.roda.core.data.v2.representation.ChangeTypeRequest;
 import org.roda.core.data.v2.representation.RepresentationTypeOptions;
@@ -43,13 +38,10 @@
 import org.roda.wui.api.v2.utils.ApiUtils;
 import org.roda.wui.api.v2.utils.CommonServicesUtils;
 import org.roda.wui.client.services.RepresentationRestService;
-import org.roda.wui.common.ControllerAssistant;
 import org.roda.wui.common.I18nUtility;
 import org.roda.wui.common.RequestControllerAssistant;
 import org.roda.wui.common.model.RequestContext;
 import org.roda.wui.common.utils.RequestUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -66,7 +58,7 @@
 @RestController
 @RequestMapping(path = "/api/v2/representations")
 public class RepresentationController implements RepresentationRestService, Exportable {
-  private static final Logger LOGGER = LoggerFactory.getLogger(RepresentationController.class);
+
   @Autowired
   private HttpServletRequest request;
   @Autowired
@@ -78,13 +70,11 @@ public class RepresentationController implements RepresentationRestService, Expo
 
   @Override
   public IndexedRepresentation findByUuid(String uuid, String localeString) {
-    RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
     return indexService.retrieve(IndexedRepresentation.class, uuid, new ArrayList<>());
   }
 
   @Override
   public IndexResult<IndexedRepresentation> find(@RequestBody FindRequest findRequest, String localeString) {
-    RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
     return indexService.find(IndexedRepresentation.class, findRequest, localeString);
   }
 
@@ -100,7 +90,6 @@ public LongResponse count(@RequestBody CountRequest countRequest) {
 
   @Override
   public List<String> suggest(@RequestBody SuggestRequest suggestRequest) {
-    RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
     return indexService.suggest(suggestRequest, IndexedRepresentation.class);
   }
 

roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/services/RepresentationService.java

@@ -1,6 +1,5 @@
 package org.roda.wui.api.v2.services;
 
-import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -11,7 +10,6 @@
 import java.util.Optional;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.coyote.Request;
 import org.roda.core.RodaCoreFactory;
 import org.roda.core.common.Messages;
 import org.roda.core.common.iterables.CloseableIterables;
@@ -22,8 +20,6 @@
 import org.roda.core.data.exceptions.NotFoundException;
 import org.roda.core.data.exceptions.RODAException;
 import org.roda.core.data.exceptions.RequestNotValidException;
-import org.roda.core.data.v2.ConsumesOutputStream;
-import org.roda.core.data.v2.DefaultConsumesOutputStream;
 import org.roda.core.data.v2.StreamResponse;
 import org.roda.core.data.v2.index.select.SelectedItems;
 import org.roda.core.data.v2.ip.IndexedRepresentation;
@@ -45,10 +41,8 @@
 import org.roda.core.plugins.base.maintenance.ChangeRepresentationStatusPlugin;
 import org.roda.core.plugins.base.maintenance.ChangeTypePlugin;
 import org.roda.core.plugins.base.maintenance.DeleteRODAObjectPlugin;
-import org.roda.core.storage.Binary;
 import org.roda.wui.api.v2.utils.ApiUtils;
 import org.roda.wui.api.v2.utils.CommonServicesUtils;
-import org.roda.wui.common.HTMLUtils;
 import org.roda.wui.common.model.RequestContext;
 import org.roda.wui.common.server.ServerTools;
 import org.slf4j.Logger;
@@ -61,11 +55,9 @@
 @Service
 public class RepresentationService {
   private static final Logger LOGGER = LoggerFactory.getLogger(RepresentationService.class);
-  private static final String HTML_EXT = ".html";
 
-  private static DescriptiveMetadataInfo retrieveDescriptiveMetadataBundle(String aipId, String representationId,
+  private static DescriptiveMetadataInfo retrieveDescriptiveMetadataBundle(ModelService model,
     DescriptiveMetadata descriptiveMetadata, final Locale locale) {
-    ModelService model = RodaCoreFactory.getModelService();
     Messages messages = RodaCoreFactory.getI18NMessages(locale);
     DescriptiveMetadataInfo info = new DescriptiveMetadataInfo();
     info.setId(descriptiveMetadata.getId());
@@ -107,7 +99,8 @@ public Representation retrieveAIPRepresentation(RequestContext requestContext, I
     return model.retrieveRepresentation(aipId, representationId);
   }
 
-  public StreamResponse retrieveAIPRepresentationBinary(RequestContext requestContext, IndexedRepresentation representation)
+  public StreamResponse retrieveAIPRepresentationBinary(RequestContext requestContext,
+    IndexedRepresentation representation)
     throws GenericException, RequestNotValidException, NotFoundException, AuthorizationDeniedException {
     return ApiUtils.download(requestContext, representation);
   }
@@ -203,35 +196,15 @@ private static List<DescriptiveMetadata> orderDescriptiveMetadata(List<Descripti
     return orderedMetadata;
   }
 
-  public StreamResponse retrieveRepresentationDescriptiveMetadata(String aipId, String representationId,
-    String metadataId, String localeString)
-    throws AuthorizationDeniedException, RequestNotValidException, NotFoundException, GenericException {
-    ModelService modelService = RodaCoreFactory.getModelService();
-    Binary descriptiveMetadataBinary = modelService.retrieveDescriptiveMetadataBinary(aipId, representationId,
-      metadataId);
-    String filename = descriptiveMetadataBinary.getStoragePath().getName() + HTML_EXT;
-    DescriptiveMetadata descriptiveMetadata = modelService.retrieveDescriptiveMetadata(aipId, representationId,
-      metadataId);
-    String htmlDescriptive = HTMLUtils.descriptiveMetadataToHtml(descriptiveMetadataBinary,
-      descriptiveMetadata.getType(), descriptiveMetadata.getVersion(), ServerTools.parseLocale(localeString));
-
-    ConsumesOutputStream stream = new DefaultConsumesOutputStream(filename, RodaConstants.MEDIA_TYPE_TEXT_HTML, out -> {
-      PrintStream printStream = new PrintStream(out);
-      printStream.print(htmlDescriptive);
-      printStream.close();
-    });
-
-    return new StreamResponse(stream);
-  }
-
-  public StreamResponse retrieveAIPRepresentationOtherMetadata(RequestContext requestContext, IndexedRepresentation representation)
+  public StreamResponse retrieveAIPRepresentationOtherMetadata(RequestContext requestContext,
+    IndexedRepresentation representation)
     throws GenericException, RequestNotValidException, NotFoundException, AuthorizationDeniedException {
     return ApiUtils.download(requestContext, representation, RodaConstants.STORAGE_DIRECTORY_METADATA,
       RodaConstants.STORAGE_DIRECTORY_OTHER);
   }
 
-  public DescriptiveMetadataInfos getDescriptiveMetadata(RequestContext requestContext, IndexedRepresentation indexedRepresentation,
-    String localeString)
+  public DescriptiveMetadataInfos getDescriptiveMetadata(RequestContext requestContext,
+    IndexedRepresentation indexedRepresentation, String localeString)
     throws AuthorizationDeniedException, RequestNotValidException, NotFoundException, GenericException {
     Locale locale = ServerTools.parseLocale(localeString);
     DescriptiveMetadataInfos descriptiveMetadataInfos = new DescriptiveMetadataInfos();
@@ -244,8 +217,8 @@ public DescriptiveMetadataInfos getDescriptiveMetadata(RequestContext requestCon
       List<DescriptiveMetadata> orderedMetadata = orderDescriptiveMetadata(representation.getDescriptiveMetadata());
 
       for (DescriptiveMetadata descriptiveMetadata : orderedMetadata) {
-        descriptiveMetadataInfos.addObject(retrieveDescriptiveMetadataBundle(representation.getAipId(),
-          representation.getId(), descriptiveMetadata, locale));
+        descriptiveMetadataInfos
+          .addObject(retrieveDescriptiveMetadataBundle(requestContext.getModelService(), descriptiveMetadata, locale));
       }
     }