Merge pull request DSpace#11888 from DSpace/backport-11110-to-dspace-9_x

[Port dspace-9_x] Removing unused collection conversion - fixes DSpace#10750

Author: tdonohue

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

@@ -7,24 +7,16 @@
  */
 package org.dspace.app.rest.converter;
 
-import java.sql.SQLException;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.stream.Collectors;
 
-import jakarta.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.Logger;
-import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.SubmissionDefinitionRest;
 import org.dspace.app.rest.model.SubmissionSectionRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.app.rest.submit.DataProcessingStep;
-import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.app.util.SubmissionConfig;
-import org.dspace.app.util.SubmissionConfigReaderException;
 import org.dspace.app.util.SubmissionStepConfig;
-import org.dspace.content.Collection;
-import org.dspace.core.Context;
 import org.dspace.services.RequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -75,21 +67,6 @@ public SubmissionDefinitionRest convert(SubmissionConfig obj, Projection project
                         e);
             }
         }
-
-        HttpServletRequest request = requestService.getCurrentRequest().getHttpServletRequest();
-        Context context = null;
-        try {
-            context = ContextUtil.obtainContext(request);
-            List<Collection> collections = panelConverter.getSubmissionConfigService()
-                                                         .getCollectionsBySubmissionConfig(context,
-                                                                                           obj.getSubmissionName());
-            DSpaceConverter<Collection, CollectionRest> cc = converter.getConverter(Collection.class);
-            List<CollectionRest> collectionsRest = collections.stream().map((collection) ->
-                    cc.convert(collection, projection)).collect(Collectors.toList());
-            sd.setCollections(collectionsRest);
-        } catch (SQLException | IllegalStateException | SubmissionConfigReaderException e) {
-            log.error(e.getMessage(), e);
-        }
         sd.setPanels(panels);
         return sd;
     }

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

@@ -190,8 +190,7 @@ public void findCollections() throws Exception {
         //Match only that a section exists with a submission configuration behind
         getClient(token).perform(get("/api/config/submissiondefinitions/traditional/collections")
                    .param("projection", "full"))
-                   .andExpect(status().isOk())
-                   .andExpect(jsonPath("$.page.totalElements", is(0)));
+                   .andExpect(status().isNoContent());
     }
 
     @Test

dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SubmissionDefinitionsMatcher.java

@@ -35,7 +35,7 @@ public static Matcher<Object> matchSubmissionDefinition(boolean isDefault, Strin
      */
     public static Matcher<? super Object> matchFullEmbeds() {
         return matchEmbeds(
-                "collections[]",
+                "collections",
                 "sections"
         );
     }