-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into MODLD-582
- Loading branch information
Showing
28 changed files
with
445 additions
and
177 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,4 +13,4 @@ | |
| <option name="Make" enabled="true" /> | ||
| </method> | ||
| </configuration> | ||
| </component> | ||
| </component> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
src/main/java/org/folio/linked/data/client/SpecClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package org.folio.linked.data.client; | ||
|
|
||
| import static org.folio.linked.data.util.Constants.Cache.SPEC_RULES; | ||
|
|
||
| import java.util.UUID; | ||
| import org.folio.rspec.domain.dto.SpecificationDtoCollection; | ||
| import org.folio.rspec.domain.dto.SpecificationRuleDtoCollection; | ||
| import org.springframework.cache.annotation.Cacheable; | ||
| import org.springframework.cloud.openfeign.FeignClient; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.PathVariable; | ||
|
|
||
| @FeignClient(name = "specification-storage") | ||
| public interface SpecClient { | ||
|
|
||
| @Cacheable(cacheNames = "bib-marc-specs") | ||
| @GetMapping(value = "/specifications?profile=bibliographic&family=MARC") | ||
| ResponseEntity<SpecificationDtoCollection> getBibMarcSpecs(); | ||
|
|
||
| @Cacheable(cacheNames = SPEC_RULES, key = "#specId") | ||
| @GetMapping(value = "/specifications/{specId}/rules") | ||
| ResponseEntity<SpecificationRuleDtoCollection> getSpecRules(@PathVariable("specId") UUID specId); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
src/main/java/org/folio/linked/data/job/CacheCleaningJob.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package org.folio.linked.data.job; | ||
|
|
||
| import static org.folio.linked.data.util.Constants.Cache.SPEC_RULES; | ||
|
|
||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.cache.annotation.CacheEvict; | ||
| import org.springframework.scheduling.annotation.Scheduled; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| @Component | ||
| @Slf4j | ||
| public class CacheCleaningJob { | ||
|
|
||
| @CacheEvict(value = SPEC_RULES, allEntries = true) | ||
| @Scheduled(fixedRateString = "${mod-linked-data.cache.ttl.spec-rules}") | ||
| public void emptySpecRules() { | ||
| log.info("Emptying {} cache", SPEC_RULES); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
src/main/java/org/folio/linked/data/validation/spec/SpecProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package org.folio.linked.data.validation.spec; | ||
|
|
||
| import java.util.List; | ||
| import org.folio.rspec.domain.dto.SpecificationRuleDto; | ||
|
|
||
| public interface SpecProvider { | ||
|
|
||
| List<SpecificationRuleDto> getSpecRules(); | ||
| } |
46 changes: 46 additions & 0 deletions
46
src/main/java/org/folio/linked/data/validation/spec/impl/SpecProviderImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package org.folio.linked.data.validation.spec.impl; | ||
|
|
||
| import feign.FeignException; | ||
| import java.util.Collection; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.folio.linked.data.client.SpecClient; | ||
| import org.folio.linked.data.validation.spec.SpecProvider; | ||
| import org.folio.rspec.domain.dto.SpecificationDto; | ||
| import org.folio.rspec.domain.dto.SpecificationDtoCollection; | ||
| import org.folio.rspec.domain.dto.SpecificationRuleDto; | ||
| import org.folio.rspec.domain.dto.SpecificationRuleDtoCollection; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| @Component | ||
| @RequiredArgsConstructor | ||
| @Slf4j | ||
| public class SpecProviderImpl implements SpecProvider { | ||
|
|
||
| private final SpecClient client; | ||
|
|
||
| @Override | ||
| public List<SpecificationRuleDto> getSpecRules() { | ||
| try { | ||
| return Optional.ofNullable(client.getBibMarcSpecs().getBody()) | ||
| .map(SpecificationDtoCollection::getSpecifications) | ||
| .stream() | ||
| .flatMap(Collection::stream) | ||
| .findFirst() | ||
| .map(SpecificationDto::getId) | ||
| .map(client::getSpecRules) | ||
| .map(ResponseEntity::getBody) | ||
| .map(SpecificationRuleDtoCollection::getRules) | ||
| .stream() | ||
| .flatMap(Collection::stream) | ||
| .toList(); | ||
| } catch (FeignException e) { | ||
| log.error("Unexpected exception during specification rules retrieval", e); | ||
| return Collections.emptyList(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.