diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/ExternalUrlConfigProvider.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/ExternalUrlConfigProvider.java deleted file mode 100644 index 993999b7c..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/ExternalUrlConfigProvider.java +++ /dev/null @@ -1,37 +0,0 @@ -package eu.eudat.service.externalfetcher; - -import eu.eudat.service.externalfetcher.config.ExternalUrls; -import eu.eudat.service.storage.StorageFileService; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.Unmarshaller; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - -import java.io.ByteArrayInputStream; - -@Service -public class ExternalUrlConfigProvider { - private static final Logger logger = LoggerFactory.getLogger(ExternalUrlConfigProvider.class); - - private ExternalUrls externalUrls; - private final StorageFileService storageFileService; - - public ExternalUrlConfigProvider(StorageFileService storageFileService) { - this.storageFileService = storageFileService; - } - - public ExternalUrls getExternalUrls() { - if (externalUrls == null) { - byte[] bytes = this.storageFileService.getExternalUrlsFile(); - try { - JAXBContext jaxbContext = JAXBContext.newInstance(ExternalUrls.class); - Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller(); - externalUrls = (ExternalUrls) jaxbUnmarshaller.unmarshal(new ByteArrayInputStream(bytes)); - } catch (Exception ex) { - logger.error("Cannot find resource", ex); - } - } - return externalUrls; - } -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/ExternalUrls.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/ExternalUrls.java deleted file mode 100644 index aaa40ca3a..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/service/externalfetcher/config/ExternalUrls.java +++ /dev/null @@ -1,31 +0,0 @@ -package eu.eudat.service.externalfetcher.config; - - -import eu.eudat.service.externalfetcher.config.prefilling.PrefillingConfigMapAdapter; - -import eu.eudat.service.externalfetcher.config.entities.*; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.io.Serializable; -import java.util.Map; - -@XmlRootElement -public class ExternalUrls implements Serializable { - - private static final long serialVersionUID = -5076364662014107275L; - - Map prefillings; - - public Map getPrefillings() { - return prefillings; - } - - @XmlJavaTypeAdapter(PrefillingConfigMapAdapter.class) - @XmlElement(name = "prefillings") - public void setPrefillings(Map prefillings) { - this.prefillings = prefillings; - } -} - - diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java index 6c9276eef..ecb30f663 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java @@ -18,7 +18,6 @@ import eu.eudat.model.descriptionproperties.PropertyDefinitionFieldSet; import eu.eudat.model.descriptionproperties.PropertyDefinitionFieldSetItem; import eu.eudat.model.persist.DescriptionProfilingRequest; import eu.eudat.model.persist.DescriptionProfilingWithDataRequest; -import eu.eudat.service.externalfetcher.ExternalUrlConfigProvider; import eu.eudat.service.externalfetcher.config.entities.*; import eu.eudat.service.externalfetcher.criteria.ExternalReferenceCriteria; import gr.cite.tools.data.builder.BuilderFactory; @@ -59,7 +58,6 @@ public class PrefillingServiceImpl implements PrefillingService { private final BuilderFactory builderFactory; private final ConventionService conventionService; private final MessageSource messageSource; - private final ExternalUrlConfigProvider externalUrlConfigProvider; private final XmlHandlingService xmlHandlingService; private final ValidatorFactory validatorFactory; @Autowired @@ -68,14 +66,12 @@ public class PrefillingServiceImpl implements PrefillingService { BuilderFactory builderFactory, ConventionService conventionService, MessageSource messageSource, - ExternalUrlConfigProvider externalUrlConfigProvider, XmlHandlingService xmlHandlingService, ValidatorFactory validatorFactory) { this.entityManager = entityManager; this.builderFactory = builderFactory; this.conventionService = conventionService; this.messageSource = messageSource; - this.externalUrlConfigProvider = externalUrlConfigProvider; this.xmlHandlingService = xmlHandlingService; this.validatorFactory = validatorFactory; } @@ -88,7 +84,6 @@ public class PrefillingServiceImpl implements PrefillingService { externalReferenceCriteria.setLike(lookup.getLike()); List prefillings = new ArrayList<>(); List> map; - Map prefillingConfigs = this.externalUrlConfigProvider.getExternalUrls().getPrefillings(); // for (PrefillingConfig prefillingConfig: prefillingConfigs.values()) {//TODO new reference logic // map = remoteFetcherService.getExternalData(prefillingConfig.getPrefillingSearch().getUrls(), externalReferenceCriteria, prefillingConfig.getPrefillingSearch().getFetchMode()); // prefillings.addAll(map.stream().map(submap -> PrefillingEntity.build(submap, this.jsonHandlingService)).toList()); @@ -105,7 +100,7 @@ public class PrefillingServiceImpl implements PrefillingService { @Override public Description getPrefilledDescription(DescriptionProfilingRequest model) throws JAXBException, ParserConfigurationException, IOException, InstantiationException, IllegalAccessException, SAXException { - PrefillingConfig prefillingConfig = this.externalUrlConfigProvider.getExternalUrls().getPrefillings().get(model.getConfigId()); + PrefillingConfig prefillingConfig = null; PrefillingGet prefillingGet = prefillingConfig.getPrefillingGet(); Map prefillingEntity = getSinglePrefillingData(prefillingGet.getUrl(), model.getPrefillId()); DescriptionProfilingWithDataRequest descriptionProfilingWithDataRequest = new DescriptionProfilingWithDataRequest(); @@ -129,7 +124,7 @@ public class PrefillingServiceImpl implements PrefillingService { @Override public Description getPrefilledDescriptionUsingData(DescriptionProfilingWithDataRequest model) throws JAXBException, ParserConfigurationException, IOException, InstantiationException, IllegalAccessException, SAXException { - PrefillingConfig prefillingConfig = this.externalUrlConfigProvider.getExternalUrls().getPrefillings().get(model.getConfigId()); + PrefillingConfig prefillingConfig = null; PrefillingGet prefillingGet = prefillingConfig.getPrefillingGet(); DescriptionTemplateEntity descriptionTemplateEntity = this.entityManager.find(DescriptionTemplateEntity.class, model.getDescriptionTemplateId()); diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/storage/StorageFileService.java b/dmp-backend/core/src/main/java/eu/eudat/service/storage/StorageFileService.java index 35926f360..ad088853e 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/storage/StorageFileService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/storage/StorageFileService.java @@ -33,8 +33,6 @@ public interface StorageFileService extends ApplicationListener