Skip to content
Snippets Groups Projects

Rodn document file

Merged Nicolas.Rod requested to merge rodn-document-file into master
All threads resolved!
Files
42
@@ -9,7 +9,6 @@ import java.time.ZoneOffset;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
@@ -28,16 +27,6 @@ import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.util.StreamUtils;
import ch.unige.solidify.SolidifyConstants;
import ch.unige.solidify.exception.SolidifyRuntimeException;
import ch.unige.solidify.rest.Collection;
import ch.unige.solidify.rest.CollectionPage;
import ch.unige.solidify.service.GitInfoService;
import ch.unige.solidify.service.MessageService;
import ch.unige.solidify.util.CollectionTool;
import ch.unige.solidify.util.StringTool;
import ch.unige.solidify.util.XMLTool;
import ch.unige.aou.AouConstants;
import ch.unige.aou.AouXmlNamespacePrefixMapper;
import ch.unige.aou.business.OAISetService;
@@ -74,11 +63,23 @@ import ch.unige.aou.model.xml.oai.v2.oai_identifier.OaiIdentifierType;
import ch.unige.aou.repository.OAISetRepository;
import ch.unige.aou.specification.OAISetSpecification;
import ch.unige.solidify.SolidifyConstants;
import ch.unige.solidify.exception.SolidifyRuntimeException;
import ch.unige.solidify.rest.Collection;
import ch.unige.solidify.rest.CollectionPage;
import ch.unige.solidify.service.GitInfoService;
import ch.unige.solidify.service.MessageService;
import ch.unige.solidify.util.CollectionTool;
import ch.unige.solidify.util.StringTool;
import ch.unige.solidify.util.XMLTool;
@Service
@ConditionalOnBean(AccessController.class)
public class OAIService extends AouService {
private static final Logger log = LoggerFactory.getLogger(OAIService.class);
private AouRestClientService restClientService;
private final ObjectFactory oaiDcFactory = new ObjectFactory();
private final GitInfoService gitInfoService;
private final IdentifierService identifierService;
@@ -94,7 +95,8 @@ public class OAIService extends AouService {
public OAIService(AouProperties config, MessageService messageService, AouRestClientService restClientService, SearchMgmt searchMgmt,
OAISetService oaiSetService, GitInfoService gitInfoService, IdentifierService identifierService, MetadataService metadataService,
OAISetRepository oaiSetRepository) {
super(config, messageService, restClientService);
super(config, messageService);
this.restClientService = restClientService;
this.searchMgmt = searchMgmt;
this.oaiSetService = oaiSetService;
this.oaiSetRepository = oaiSetRepository;
Loading