diff --git a/dmp-migration-tool/pom.xml b/dmp-migration-tool/pom.xml index d8fe2b713..f0c3012ab 100644 --- a/dmp-migration-tool/pom.xml +++ b/dmp-migration-tool/pom.xml @@ -10,11 +10,12 @@ org.springframework.boot spring-boot-starter-parent - 3.1.2 + 3.2.4 queryable + ../dmp-backend/core web data elastic @@ -301,16 +302,26 @@ io.micrometer micrometer-core + + org.jboss + jandex + 3.1.2 + gr.cite data-tools - 2.1.0 + 2.1.2 gr.cite exceptions + 2.2.0 + + + gr.cite + oidc-authz 2.1.0 diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/proxy/fetching/RemoteFetcher.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/proxy/fetching/RemoteFetcher.java index 323ecccd8..75d698d8b 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/proxy/fetching/RemoteFetcher.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/logic/proxy/fetching/RemoteFetcher.java @@ -387,7 +387,8 @@ public class RemoteFetcher { JsonNode jsonBody = new ObjectMapper().readTree(replacedBody); entity = new HttpEntity<>(jsonBody, headers); - response = restTemplate.exchange(replacedPath, HttpMethod.resolve(requestType), entity, String.class); +// response = restTemplate.exchange(replacedPath, HttpMethod.resolve(requestType), entity, String.class); + response = null; if (response.getStatusCode() == HttpStatus.OK) { if (response.getHeaders().get("Content-Type").get(0).contains("json")) { DocumentContext jsonContext = JsonPath.parse(response.getBody()); @@ -423,7 +424,8 @@ public class RemoteFetcher { JsonNode jsonBody = new ObjectMapper().readTree(requestBody); entity = new HttpEntity<>(jsonBody, headers); - response = restTemplate.exchange(urlString, HttpMethod.resolve(requestType), entity, String.class); +// response = restTemplate.exchange(urlString, HttpMethod.resolve(requestType), entity, String.class); + response = null; if (response.getStatusCode() == HttpStatus.OK) { // success //do here all the parsing Results results = new Results(); diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlMigrationService.java index 33a279f2f..ed5350214 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlMigrationService.java @@ -25,6 +25,7 @@ import gr.cite.tools.data.query.QueryFactory; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.logging.LoggerService; import jakarta.persistence.EntityManager; +import jakarta.ws.rs.NotSupportedException; import jakarta.xml.bind.JAXBException; import org.jetbrains.annotations.NotNull; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import org.w3c.dom.Document; import org.xml.sax.SAXException; import javax.management.InvalidApplicationException; -import javax.ws.rs.NotSupportedException; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; import java.io.IOException;