From 5203ec4b729b03825bab447c49644b872f157eb9 Mon Sep 17 00:00:00 2001 From: amentis Date: Wed, 18 Oct 2023 13:53:52 +0300 Subject: [PATCH] fix remote fetcher --- .../logic/proxy/fetching/RemoteFetcher.java | 50 ------------------- 1 file changed, 50 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java index 212d8f4ad..86a9742f9 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java @@ -50,56 +50,6 @@ public class RemoteFetcher { ).clientConnector(new ReactorClientHttpConnector(HttpClient.create().followRedirect(true))).build(); } - //@Cacheable(value = "tempexternalType", keyGenerator = "externalUrlsKeyGenerator") - public List> get(String externalType, ExternalUrlCriteria externalUrlCriteria, String key) throws eu.eudat.proxy.config.exceptions.NoURLFound, eu.eudat.proxy.config.exceptions.HugeResultSet { - List urlConfigs = null; - FetchStrategy fetchStrategy = null; - switch (externalType){ - case "taxonomies": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getTaxonomies().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getTaxonomies().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getTaxonomies().getFetchMode(); - break; - case "licenses": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getLicenses().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getLicenses().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getLicenses().getFetchMode(); - break; - case "publications": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getPublications().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getPublications().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getPublications().getFetchMode(); - break; - case "journals": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getJournals().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getJournals().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getJournals().getFetchMode(); - break; - case "pubRepositories": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getPubRepositories().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getPubRepositories().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getPubRepositories().getFetchMode(); - break; - case "dataRepositories": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getRepositories().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getRepositories().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getRepositories().getFetchMode(); - break; - case "registries": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getRegistries().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getRegistries().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getRegistries().getFetchMode(); - break; - case "services": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getServices().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getServices().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getServices().getFetchMode(); - break; - } - - return getAll(urlConfigs, fetchStrategy, externalUrlCriteria); - } - @Cacheable(value = "repositories", keyGenerator = "externalUrlsKeyGenerator") public List> getRepositories(ExternalUrlCriteria externalUrlCriteria, String key) throws NoURLFound, HugeResultSet { List urlConfigs =