logging changes
This commit is contained in:
parent
37eaa4cdf5
commit
f080312a59
|
@ -3,14 +3,12 @@ package org.opencdmp.deposit.zenodorepository.service.zenodo;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import gr.cite.tools.exception.MyApplicationException;
|
import gr.cite.tools.exception.MyApplicationException;
|
||||||
import gr.cite.tools.logging.LoggerService;
|
import gr.cite.tools.logging.LoggerService;
|
||||||
import gr.cite.tools.logging.MapLogEntry;
|
|
||||||
import org.opencdmp.commonmodels.models.FileEnvelopeModel;
|
import org.opencdmp.commonmodels.models.FileEnvelopeModel;
|
||||||
import org.opencdmp.commonmodels.models.dmp.DmpModel;
|
import org.opencdmp.commonmodels.models.dmp.DmpModel;
|
||||||
import org.opencdmp.depositbase.repository.DepositConfiguration;
|
import org.opencdmp.depositbase.repository.DepositConfiguration;
|
||||||
import org.opencdmp.deposit.zenodorepository.model.ZenodoDeposit;
|
import org.opencdmp.deposit.zenodorepository.model.ZenodoDeposit;
|
||||||
import org.opencdmp.deposit.zenodorepository.model.builder.ZenodoBuilder;
|
import org.opencdmp.deposit.zenodorepository.model.builder.ZenodoBuilder;
|
||||||
import org.opencdmp.deposit.zenodorepository.service.storage.FileStorageService;
|
import org.opencdmp.deposit.zenodorepository.service.storage.FileStorageService;
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.core.ParameterizedTypeReference;
|
import org.springframework.core.ParameterizedTypeReference;
|
||||||
|
@ -185,7 +183,11 @@ public class ZenodoDepositServiceImpl implements ZenodoDepositService {
|
||||||
String newVersionUrl = links.get(ZENODO_LINKS_LATEST_DRAFT) + "/actions/newversion" + "?access_token=" + zenodoToken;
|
String newVersionUrl = links.get(ZENODO_LINKS_LATEST_DRAFT) + "/actions/newversion" + "?access_token=" + zenodoToken;
|
||||||
logger.debug("new version url: " + newVersionUrl);
|
logger.debug("new version url: " + newVersionUrl);
|
||||||
createResponse = zenodoClient.post().uri(newVersionUrl)
|
createResponse = zenodoClient.post().uri(newVersionUrl)
|
||||||
.bodyValue(null).exchangeToMono(mono -> mono.bodyToMono(new ParameterizedTypeReference<Map<String, LinkedHashMap<String, String>>>() {})).block();
|
.bodyValue(null).exchangeToMono(mono ->
|
||||||
|
mono.statusCode().isError() ?
|
||||||
|
mono.createException().flatMap(Mono::error) :
|
||||||
|
mono.bodyToMono(new ParameterizedTypeReference<Map<String, LinkedHashMap<String, String>>>() {})
|
||||||
|
).block();
|
||||||
logger.debug("createResponse-newVersion:");
|
logger.debug("createResponse-newVersion:");
|
||||||
logger.debug(objectMapper.writeValueAsString(createResponse));
|
logger.debug(objectMapper.writeValueAsString(createResponse));
|
||||||
links = createResponse == null ? new LinkedHashMap<>() : createResponse.getOrDefault(ZENODO_LINKS, new LinkedHashMap<>());
|
links = createResponse == null ? new LinkedHashMap<>() : createResponse.getOrDefault(ZENODO_LINKS, new LinkedHashMap<>());
|
||||||
|
@ -289,14 +291,11 @@ public class ZenodoDepositServiceImpl implements ZenodoDepositService {
|
||||||
map.add(REDIRECT_URI, depositConfiguration.getRedirectUri());
|
map.add(REDIRECT_URI, depositConfiguration.getRedirectUri());
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Map<String, Object> values = client.post().uri(depositConfiguration.getRepositoryAccessTokenUrl()).bodyValue(map).exchangeToMono(mono -> {
|
Map<String, Object> values = client.post().uri(depositConfiguration.getRepositoryAccessTokenUrl()).bodyValue(map).exchangeToMono(mono ->
|
||||||
if (!mono.statusCode().is2xxSuccessful()) {
|
mono.statusCode().isError() ?
|
||||||
mono.createException();
|
mono.createException().flatMap(Mono::error) :
|
||||||
throw new HttpClientErrorException(mono.statusCode());
|
mono.bodyToMono(new ParameterizedTypeReference<Map<String, Object>>() {
|
||||||
}
|
})).block();
|
||||||
return mono.bodyToMono(new ParameterizedTypeReference<Map<String, Object>>() {
|
|
||||||
});
|
|
||||||
}).block();
|
|
||||||
|
|
||||||
return values != null ? (String) values.getOrDefault(ACCESS_TOKEN, null) : null;
|
return values != null ? (String) values.getOrDefault(ACCESS_TOKEN, null) : null;
|
||||||
} catch (HttpClientErrorException ex) {
|
} catch (HttpClientErrorException ex) {
|
||||||
|
|
Loading…
Reference in New Issue