diff --git a/src/main/java/fr/abes/sudoc/component/BaseXmlFunctionsCaller.java b/src/main/java/fr/abes/sudoc/component/BaseXmlFunctionsCaller.java index a3dca1b..2153532 100644 --- a/src/main/java/fr/abes/sudoc/component/BaseXmlFunctionsCaller.java +++ b/src/main/java/fr/abes/sudoc/component/BaseXmlFunctionsCaller.java @@ -1,9 +1,6 @@ package fr.abes.sudoc.component; -import fr.abes.sudoc.utils.ExecutionTime; import lombok.extern.slf4j.Slf4j; -import org.hibernate.annotations.ColumnTransformer; -import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.UncategorizedSQLException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; diff --git a/src/main/java/fr/abes/sudoc/controller/SudocController.java b/src/main/java/fr/abes/sudoc/controller/SudocController.java index f56570d..029f3c1 100644 --- a/src/main/java/fr/abes/sudoc/controller/SudocController.java +++ b/src/main/java/fr/abes/sudoc/controller/SudocController.java @@ -29,14 +29,21 @@ @RequestMapping("/api/v1") public class SudocController { - @Autowired - private IdentifiantFactory factory; - @Autowired - private SudocService service; - @Autowired - private NoticeService noticeService; - @Autowired - private ProviderService providerService; + + private final IdentifiantFactory factory; + + private final SudocService service; + + private final NoticeService noticeService; + + private final ProviderService providerService; + + public SudocController(IdentifiantFactory factory, SudocService service, NoticeService noticeService, ProviderService providerService) { + this.factory = factory; + this.service = service; + this.noticeService = noticeService; + this.providerService = providerService; + } @GetMapping(value = {"/online_identifier_2_ppn/{type}/{onlineIdentifier}", "/online_identifier_2_ppn/{type}/{onlineIdentifier}/{provider}"}, produces = MediaType.APPLICATION_JSON_VALUE) diff --git a/src/main/java/fr/abes/sudoc/service/IsbnService.java b/src/main/java/fr/abes/sudoc/service/IsbnService.java index 2a896b9..e6fdba2 100644 --- a/src/main/java/fr/abes/sudoc/service/IsbnService.java +++ b/src/main/java/fr/abes/sudoc/service/IsbnService.java @@ -1,14 +1,10 @@ package fr.abes.sudoc.service; -import com.fasterxml.jackson.core.JsonProcessingException; import fr.abes.sudoc.component.BaseXmlFunctionsCaller; -import fr.abes.sudoc.exception.IllegalPpnException; -import fr.abes.sudoc.utils.Utilitaire; import org.springframework.jdbc.UncategorizedSQLException; import org.springframework.stereotype.Service; import java.io.IOException; -import java.sql.SQLRecoverableException; import java.util.List; @Service diff --git a/src/main/java/fr/abes/sudoc/service/ProviderService.java b/src/main/java/fr/abes/sudoc/service/ProviderService.java index 1bd27fa..a555867 100644 --- a/src/main/java/fr/abes/sudoc/service/ProviderService.java +++ b/src/main/java/fr/abes/sudoc/service/ProviderService.java @@ -37,13 +37,14 @@ public Optional getProviderDisplayName(Optional shortname) { Optional providerDisplayName = Optional.empty(); if (shortname.isPresent()) { Optional provider = this.providerRepository.findByProvider(shortname.get()); - Optional elementDto = Optional.of(new ElementDto()); if (provider.isPresent()) { - elementDto.get().setProvider(provider.get().getProvider()); - elementDto.get().setDisplayName(provider.get().getDisplayName()); - elementDto.get().setIdProvider(provider.get().getIdtProvider()); + ElementDto elementDto = new ElementDto(); + elementDto.setProvider(provider.get().getProvider()); + elementDto.setDisplayName(provider.get().getDisplayName()); + elementDto.setIdProvider(provider.get().getIdtProvider()); + providerDisplayName = Optional.of(elementDto); } - providerDisplayName = elementDto; + } return providerDisplayName; } @@ -73,7 +74,7 @@ public boolean checkProviderDansNoticeGeneral(Optional providerDispl || this.checkProviderDansNotice(providerDisplayName.get().getProvider(), notice) || this.checkProviderIn035(providerDisplayName.get().getIdProvider(), notice); } - return false; + return true; } private boolean checkProviderDansNotice(String provider, NoticeXml notice) {