Skip to content
Snippets Groups Projects

chore: upgrade to Solidify 3

Merged Nicolas.Rod requested to merge rodn-solidify-3 into master
229 files
+ 1464
1489
Compare changes
  • Side-by-side
  • Inline
Files
229
@@ -57,9 +57,10 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
import ch.unige.solidify.config.SolidifyEventPublisher;
import ch.unige.solidify.controller.IndexResourceReadOnlyController;
import ch.unige.solidify.controller.index.IndexDataReadOnlyController;
import ch.unige.solidify.exception.SolidifyHttpErrorException;
import ch.unige.solidify.exception.SolidifyRuntimeException;
import ch.unige.solidify.index.indexing.IndexingService;
import ch.unige.solidify.rest.ActionName;
import ch.unige.solidify.rest.FacetPage;
import ch.unige.solidify.rest.FacetRequest;
@@ -67,7 +68,6 @@ import ch.unige.solidify.rest.FieldsRequest;
import ch.unige.solidify.rest.RestCollection;
import ch.unige.solidify.rest.SearchCondition;
import ch.unige.solidify.security.EveryonePermissions;
import ch.unige.solidify.service.IndexResourceService;
import ch.unige.solidify.util.FileTool;
import ch.unige.solidify.util.StringTool;
@@ -92,7 +92,7 @@ import ch.unige.aou.service.SearchService;
@EveryonePermissions
@ConditionalOnBean(AccessController.class)
@RequestMapping(UrlPath.ACCESS_METADATA)
public class SearchController extends IndexResourceReadOnlyController<String, PublicationIndexEntry> {
public class SearchController extends IndexDataReadOnlyController<String, PublicationIndexEntry> {
private static final Logger log = LoggerFactory.getLogger(SearchController.class);
private static final String WITH_RESTRICTED_ACCESS_MASTERS_PARAM = "with-restricted-access-masters";
@@ -103,7 +103,7 @@ public class SearchController extends IndexResourceReadOnlyController<String, Pu
private final PublicationStatisticService publicationStatisticService;
private final SearchService searchService;
protected SearchController(AouProperties aouProperties, IndexResourceService<String, PublicationIndexEntry> indexResourceService,
protected SearchController(AouProperties aouProperties, IndexingService<PublicationIndexEntry> indexResourceService,
QueryBuilderService queryBuilderService, PublicationDownloadService archiveDownloadService,
PublicationStatisticService publicationStatisticService,
SearchService searchService) {
Loading