From e29f8759e1f30039a26f380faedae3fc034f3f71 Mon Sep 17 00:00:00 2001 From: Volodymyr Rohach Date: Thu, 30 May 2024 13:45:53 +0300 Subject: [PATCH] MODSOURCE-733: raml-storage dependency updated. (#909) * MODSOURCE-733: raml-storage dependency updated. * MODSOURCE-733: Compilation errors fixed. * MODSOURCE-733: Compilation errors fixed[2]. * MODSOURCE-733: Imports improved. --- mod-source-record-manager-server/pom.xml | 6 ++--- .../AbstractChunkProcessingService.java | 7 ++++-- .../services/ChangeEngineServiceImpl.java | 15 ++++++------ ...bProfileSnapshotValidationServiceImpl.java | 4 ++-- .../EdifactDiErrorPayloadBuilder.java | 2 +- .../org/folio/rest/impl/AbstractRestTest.java | 23 +++++-------------- .../changeManager/ChangeManagerAPITest.java | 6 ++--- .../services/ChangeEngineServiceImplTest.java | 10 ++++---- ...taImportPayloadContextBuilderImplTest.java | 4 ++-- ...fileSnapshotValidationServiceImplTest.java | 6 ++--- ...DataImportJournalConsumerVerticleTest.java | 2 +- ...nvoiceJournalConsumerVerticleMockTest.java | 2 +- ...ortInvoiceJournalConsumerVerticleTest.java | 2 +- .../RawMarcChunkConsumersVerticleTest.java | 2 +- .../EdifactErrorPayloadBuilderTest.java | 4 ++-- ramls/raml-storage | 2 +- 16 files changed, 45 insertions(+), 52 deletions(-) diff --git a/mod-source-record-manager-server/pom.xml b/mod-source-record-manager-server/pom.xml index 9289fe8eb..9a21569ea 100644 --- a/mod-source-record-manager-server/pom.xml +++ b/mod-source-record-manager-server/pom.xml @@ -59,7 +59,7 @@ org.folio mod-source-record-storage-client - 5.8.0 + 5.9.0-SNAPSHOT jar @@ -228,12 +228,12 @@ org.folio mod-di-converter-storage-client - 2.1.0 + 2.3.0-SNAPSHOT org.folio data-import-processing-core - 4.2.0 + 4.3.0-SNAPSHOT org.folio diff --git a/mod-source-record-manager-server/src/main/java/org/folio/services/AbstractChunkProcessingService.java b/mod-source-record-manager-server/src/main/java/org/folio/services/AbstractChunkProcessingService.java index 62e6bcee7..32c4451fa 100644 --- a/mod-source-record-manager-server/src/main/java/org/folio/services/AbstractChunkProcessingService.java +++ b/mod-source-record-manager-server/src/main/java/org/folio/services/AbstractChunkProcessingService.java @@ -17,6 +17,7 @@ import org.folio.rest.jaxrs.model.JobExecution; import org.folio.rest.jaxrs.model.JobExecutionSourceChunk; import org.folio.rest.jaxrs.model.ProfileSnapshotWrapper; +import org.folio.rest.jaxrs.model.ProfileType; import org.folio.rest.jaxrs.model.RawRecordsDto; import org.folio.rest.jaxrs.model.StatusDto; import org.folio.services.exceptions.UnsupportedProfileException; @@ -27,7 +28,9 @@ import java.util.List; import java.util.Map; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.*; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE; public abstract class AbstractChunkProcessingService implements ChunkProcessingService { @@ -112,7 +115,7 @@ private boolean isExistsMatchProfileToInstanceWithActionUpdateMarcBib(Collection } private ProfileSnapshotWrapper getChildSnapshotWrapperByType(ProfileSnapshotWrapper profileSnapshotWrapper, - ProfileSnapshotWrapper.ContentType contentType) { + ProfileType contentType) { if (!CollectionUtils.isEmpty(profileSnapshotWrapper.getChildSnapshotWrappers())) { List childSnapshotWrappers = profileSnapshotWrapper.getChildSnapshotWrappers(); for (ProfileSnapshotWrapper snapshotWrapper : childSnapshotWrappers) { diff --git a/mod-source-record-manager-server/src/main/java/org/folio/services/ChangeEngineServiceImpl.java b/mod-source-record-manager-server/src/main/java/org/folio/services/ChangeEngineServiceImpl.java index b4812ea90..7b7ea44d0 100644 --- a/mod-source-record-manager-server/src/main/java/org/folio/services/ChangeEngineServiceImpl.java +++ b/mod-source-record-manager-server/src/main/java/org/folio/services/ChangeEngineServiceImpl.java @@ -12,8 +12,9 @@ import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_MARC_FOR_DELETE_RECEIVED; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_MARC_FOR_UPDATE_RECEIVED; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_RAW_RECORDS_CHUNK_PARSED; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ReactTo.NON_MATCH; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE; +import static org.folio.rest.jaxrs.model.ReactToType.NON_MATCH; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_AUTHORITY; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_BIB; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_HOLDING; @@ -318,7 +319,7 @@ private void saveIncomingAndJournalRecords(List parsedRecords, String te private boolean createOrderActionExists(JobExecution jobExecution) { if (jobExecution.getJobProfileSnapshotWrapper() != null) { List actionProfiles = jobExecution.getJobProfileSnapshotWrapper().getChildSnapshotWrappers() - .stream().filter(wrapper -> wrapper.getContentType() == ProfileSnapshotWrapper.ContentType.ACTION_PROFILE).toList(); + .stream().filter(wrapper -> wrapper.getContentType() == ACTION_PROFILE).toList(); if (!actionProfiles.isEmpty() && ifOrderCreateActionProfileExists(actionProfiles)) { LOGGER.debug("createOrderActionExists:: Event type for Order's logic set by jobExecutionId {} ", jobExecution.getId()); @@ -427,7 +428,7 @@ private boolean isCreateInstanceActionExists(JobExecution jobExecution) { private boolean containsCreateInstanceActionWithoutMarcBib(ProfileSnapshotWrapper profileSnapshot) { for (ProfileSnapshotWrapper childWrapper : profileSnapshot.getChildSnapshotWrappers()) { - if (childWrapper.getContentType() == ProfileSnapshotWrapper.ContentType.ACTION_PROFILE + if (childWrapper.getContentType() == ACTION_PROFILE && actionProfileMatches(childWrapper, List.of(FolioRecord.INSTANCE), Action.CREATE)) { return childWrapper.getReactTo() != NON_MATCH && !containsMarcBibToInstanceMappingProfile(childWrapper); } else if (containsCreateInstanceActionWithoutMarcBib(childWrapper)) { @@ -465,7 +466,7 @@ private boolean isMarcAuthorityMatchProfile(JobExecution jobExecution) { private boolean containsMatchProfile(ProfileSnapshotWrapper profileSnapshot) { var childWrappers = profileSnapshot.getChildSnapshotWrappers(); for (ProfileSnapshotWrapper childWrapper : childWrappers) { - if (childWrapper.getContentType() == ProfileSnapshotWrapper.ContentType.MATCH_PROFILE + if (childWrapper.getContentType() == MATCH_PROFILE && marcAuthorityMatchProfileMatches(childWrapper)) { return true; } else if (containsMatchProfile(childWrapper)) { @@ -484,7 +485,7 @@ private boolean containsMarcActionProfile(ProfileSnapshotWrapper profileSnapshot List entityTypes, Action action) { List childWrappers = profileSnapshot.getChildSnapshotWrappers(); for (ProfileSnapshotWrapper childWrapper : childWrappers) { - if (childWrapper.getContentType() == ProfileSnapshotWrapper.ContentType.ACTION_PROFILE + if (childWrapper.getContentType() == ACTION_PROFILE && actionProfileMatches(childWrapper, entityTypes, action)) { return true; } else if (containsMarcActionProfile(childWrapper, entityTypes, action)) { @@ -497,7 +498,7 @@ && actionProfileMatches(childWrapper, entityTypes, action)) { private boolean containsCreateActionProfileWithMarcHoldings(ProfileSnapshotWrapper profileSnapshot) { List childWrappers = profileSnapshot.getChildSnapshotWrappers(); for (ProfileSnapshotWrapper childWrapper : childWrappers) { - if (childWrapper.getContentType() == ProfileSnapshotWrapper.ContentType.ACTION_PROFILE + if (childWrapper.getContentType() == ACTION_PROFILE && actionProfileMatches(childWrapper, List.of(FolioRecord.HOLDINGS), Action.CREATE) && isMarcHoldingsExists(childWrapper)) { return true; diff --git a/mod-source-record-manager-server/src/main/java/org/folio/services/validation/JobProfileSnapshotValidationServiceImpl.java b/mod-source-record-manager-server/src/main/java/org/folio/services/validation/JobProfileSnapshotValidationServiceImpl.java index 720206ff0..24757fe1d 100644 --- a/mod-source-record-manager-server/src/main/java/org/folio/services/validation/JobProfileSnapshotValidationServiceImpl.java +++ b/mod-source-record-manager-server/src/main/java/org/folio/services/validation/JobProfileSnapshotValidationServiceImpl.java @@ -20,8 +20,8 @@ import static org.folio.rest.jaxrs.model.ActionProfile.FolioRecord.MARC_BIBLIOGRAPHIC; import static org.folio.rest.jaxrs.model.ActionProfile.FolioRecord.MARC_HOLDINGS; import static org.folio.rest.jaxrs.model.ActionProfile.FolioRecord.ORDER; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; import static org.folio.rest.jaxrs.model.Record.RecordType.EDIFACT; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_AUTHORITY; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_BIB; diff --git a/mod-source-record-manager-server/src/main/java/org/folio/verticle/consumers/errorhandlers/payloadbuilders/EdifactDiErrorPayloadBuilder.java b/mod-source-record-manager-server/src/main/java/org/folio/verticle/consumers/errorhandlers/payloadbuilders/EdifactDiErrorPayloadBuilder.java index 4ac3eef12..2461fea19 100644 --- a/mod-source-record-manager-server/src/main/java/org/folio/verticle/consumers/errorhandlers/payloadbuilders/EdifactDiErrorPayloadBuilder.java +++ b/mod-source-record-manager-server/src/main/java/org/folio/verticle/consumers/errorhandlers/payloadbuilders/EdifactDiErrorPayloadBuilder.java @@ -32,7 +32,7 @@ import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_ERROR; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_INVOICE_CREATED; import static org.folio.rest.jaxrs.model.EntityType.EDIFACT_INVOICE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; import static org.folio.rest.jaxrs.model.Record.RecordType.EDIFACT; import static org.folio.services.journal.InvoiceUtil.INVOICE_LINES_KEY; diff --git a/mod-source-record-manager-server/src/test/java/org/folio/rest/impl/AbstractRestTest.java b/mod-source-record-manager-server/src/test/java/org/folio/rest/impl/AbstractRestTest.java index f9c113c35..2cd13f73f 100644 --- a/mod-source-record-manager-server/src/test/java/org/folio/rest/impl/AbstractRestTest.java +++ b/mod-source-record-manager-server/src/test/java/org/folio/rest/impl/AbstractRestTest.java @@ -9,10 +9,10 @@ import static org.folio.dataimport.util.RestUtil.OKAPI_TENANT_HEADER; import static org.folio.dataimport.util.RestUtil.OKAPI_URL_HEADER; import static org.folio.kafka.KafkaTopicNameHelper.getDefaultNameSpace; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.JOB_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.JOB_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE; import static org.folio.rest.util.OkapiConnectionParams.OKAPI_TOKEN_HEADER; import static org.folio.services.util.EventHandlingUtil.constructModuleName; @@ -60,18 +60,7 @@ import org.folio.kafka.KafkaTopicNameHelper; import org.folio.rest.RestVerticle; import org.folio.rest.client.TenantClient; -import org.folio.rest.jaxrs.model.ActionProfile; -import org.folio.rest.jaxrs.model.EntityType; -import org.folio.rest.jaxrs.model.Event; -import org.folio.rest.jaxrs.model.File; -import org.folio.rest.jaxrs.model.InitJobExecutionsRqDto; -import org.folio.rest.jaxrs.model.InitJobExecutionsRsDto; -import org.folio.rest.jaxrs.model.JobExecution; -import org.folio.rest.jaxrs.model.JobProfile; -import org.folio.rest.jaxrs.model.ProfileSnapshotWrapper; -import org.folio.rest.jaxrs.model.StatusDto; -import org.folio.rest.jaxrs.model.TenantAttributes; -import org.folio.rest.jaxrs.model.TenantJob; +import org.folio.rest.jaxrs.model.*; import org.folio.rest.persist.Criteria.Criterion; import org.folio.rest.persist.PostgresClient; import org.folio.rest.tools.utils.Envs; @@ -271,7 +260,7 @@ public abstract class AbstractRestTest { .withChildSnapshotWrappers(Collections.singletonList(new ProfileSnapshotWrapper() .withProfileId(UUID.randomUUID().toString()) .withContentType(ACTION_PROFILE) - .withReactTo(ProfileSnapshotWrapper.ReactTo.NON_MATCH) + .withReactTo(ReactToType.NON_MATCH) .withContent(actionProfile) .withChildSnapshotWrappers(Collections.singletonList(new ProfileSnapshotWrapper() .withProfileId(UUID.randomUUID().toString()) diff --git a/mod-source-record-manager-server/src/test/java/org/folio/rest/impl/changeManager/ChangeManagerAPITest.java b/mod-source-record-manager-server/src/test/java/org/folio/rest/impl/changeManager/ChangeManagerAPITest.java index 2d9db7e87..93c5dd4a0 100644 --- a/mod-source-record-manager-server/src/test/java/org/folio/rest/impl/changeManager/ChangeManagerAPITest.java +++ b/mod-source-record-manager-server/src/test/java/org/folio/rest/impl/changeManager/ChangeManagerAPITest.java @@ -16,9 +16,9 @@ import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_ERROR; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_MARC_FOR_UPDATE_RECEIVED; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_RAW_RECORDS_CHUNK_PARSED; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.JOB_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.JOB_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE; import static org.folio.rest.jaxrs.model.StatusDto.Status.CANCELLED; import static org.folio.rest.jaxrs.model.StatusDto.Status.COMMITTED; import static org.folio.rest.jaxrs.model.StatusDto.Status.ERROR; diff --git a/mod-source-record-manager-server/src/test/java/org/folio/services/ChangeEngineServiceImplTest.java b/mod-source-record-manager-server/src/test/java/org/folio/services/ChangeEngineServiceImplTest.java index 99cb8bab1..0e213066e 100644 --- a/mod-source-record-manager-server/src/test/java/org/folio/services/ChangeEngineServiceImplTest.java +++ b/mod-source-record-manager-server/src/test/java/org/folio/services/ChangeEngineServiceImplTest.java @@ -6,11 +6,11 @@ import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_INCOMING_MARC_BIB_FOR_ORDER_PARSED; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_INCOMING_MARC_BIB_RECORD_PARSED; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_MARC_FOR_UPDATE_RECEIVED; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.JOB_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ReactTo.NON_MATCH; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.JOB_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE; +import static org.folio.rest.jaxrs.model.ReactToType.NON_MATCH; import static org.folio.services.ChangeEngineServiceImpl.RECORD_ID_HEADER; import static org.folio.verticle.consumers.StoredRecordChunksKafkaHandler.ACTION_FIELD; import static org.folio.verticle.consumers.StoredRecordChunksKafkaHandler.CREATE_ACTION; diff --git a/mod-source-record-manager-server/src/test/java/org/folio/services/DataImportPayloadContextBuilderImplTest.java b/mod-source-record-manager-server/src/test/java/org/folio/services/DataImportPayloadContextBuilderImplTest.java index 8d1449f22..d7c357ae6 100644 --- a/mod-source-record-manager-server/src/test/java/org/folio/services/DataImportPayloadContextBuilderImplTest.java +++ b/mod-source-record-manager-server/src/test/java/org/folio/services/DataImportPayloadContextBuilderImplTest.java @@ -26,8 +26,8 @@ import static org.folio.rest.jaxrs.model.EntityType.MARC_AUTHORITY; import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC; import static org.folio.rest.jaxrs.model.EntityType.MARC_HOLDINGS; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.JOB_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.JOB_PROFILE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; import static org.mockito.Mockito.when; diff --git a/mod-source-record-manager-server/src/test/java/org/folio/services/validation/JobProfileSnapshotValidationServiceImplTest.java b/mod-source-record-manager-server/src/test/java/org/folio/services/validation/JobProfileSnapshotValidationServiceImplTest.java index a0d4e6eda..ef4ea9cc7 100644 --- a/mod-source-record-manager-server/src/test/java/org/folio/services/validation/JobProfileSnapshotValidationServiceImplTest.java +++ b/mod-source-record-manager-server/src/test/java/org/folio/services/validation/JobProfileSnapshotValidationServiceImplTest.java @@ -10,9 +10,9 @@ import java.util.List; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.JOB_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.JOB_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_BIB; import static org.folio.rest.jaxrs.model.Record.RecordType.MARC_HOLDING; import static org.junit.Assert.assertFalse; diff --git a/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/DataImportJournalConsumerVerticleTest.java b/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/DataImportJournalConsumerVerticleTest.java index 98cb804e4..1863b79af 100644 --- a/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/DataImportJournalConsumerVerticleTest.java +++ b/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/DataImportJournalConsumerVerticleTest.java @@ -39,7 +39,7 @@ import static org.folio.rest.jaxrs.model.JournalRecord.EntityType.HOLDINGS; import static org.folio.rest.jaxrs.model.JournalRecord.EntityType.ITEM; import static org.folio.rest.jaxrs.model.JournalRecord.EntityType.MARC_BIBLIOGRAPHIC; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; @RunWith(VertxUnitRunner.class) diff --git a/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/ImportInvoiceJournalConsumerVerticleMockTest.java b/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/ImportInvoiceJournalConsumerVerticleMockTest.java index 63eceef59..3c2ca0939 100644 --- a/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/ImportInvoiceJournalConsumerVerticleMockTest.java +++ b/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/ImportInvoiceJournalConsumerVerticleMockTest.java @@ -50,7 +50,7 @@ import static org.folio.kafka.KafkaTopicNameHelper.getDefaultNameSpace; import static org.folio.rest.jaxrs.model.EntityType.EDIFACT_INVOICE; import static org.folio.rest.jaxrs.model.EntityType.INVOICE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.JOB_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.JOB_PROFILE; import static org.folio.services.journal.InvoiceUtil.FIELD_DESCRIPTION; import static org.folio.services.journal.InvoiceUtil.FIELD_FOLIO_INVOICE_NO; import static org.folio.services.journal.InvoiceUtil.FIELD_ID; diff --git a/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/ImportInvoiceJournalConsumerVerticleTest.java b/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/ImportInvoiceJournalConsumerVerticleTest.java index 47624edad..1d579d5c8 100644 --- a/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/ImportInvoiceJournalConsumerVerticleTest.java +++ b/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/ImportInvoiceJournalConsumerVerticleTest.java @@ -41,7 +41,7 @@ import static org.folio.kafka.KafkaTopicNameHelper.getDefaultNameSpace; import static org.folio.rest.jaxrs.model.EntityType.EDIFACT_INVOICE; import static org.folio.rest.jaxrs.model.EntityType.INVOICE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.JOB_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.JOB_PROFILE; import static org.folio.services.journal.InvoiceUtil.FIELD_DESCRIPTION; import static org.folio.services.journal.InvoiceUtil.FIELD_FOLIO_INVOICE_NO; diff --git a/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/RawMarcChunkConsumersVerticleTest.java b/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/RawMarcChunkConsumersVerticleTest.java index 72c3ca12d..1a310f4c6 100644 --- a/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/RawMarcChunkConsumersVerticleTest.java +++ b/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/RawMarcChunkConsumersVerticleTest.java @@ -52,7 +52,7 @@ import static org.folio.dataimport.util.RestUtil.OKAPI_URL_HEADER; import static org.folio.rest.jaxrs.model.DataImportEventTypes.*; import static org.folio.rest.jaxrs.model.EntityType.EDIFACT_INVOICE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.*; +import static org.folio.rest.jaxrs.model.ProfileType.*; import static org.folio.rest.jaxrs.model.Record.RecordType.EDIFACT; import static org.folio.rest.util.OkapiConnectionParams.OKAPI_TENANT_HEADER; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/errorhandlers/errorpayloadbuilders/EdifactErrorPayloadBuilderTest.java b/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/errorhandlers/errorpayloadbuilders/EdifactErrorPayloadBuilderTest.java index f182e31d8..bd3a7b8d1 100644 --- a/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/errorhandlers/errorpayloadbuilders/EdifactErrorPayloadBuilderTest.java +++ b/mod-source-record-manager-server/src/test/java/org/folio/verticle/consumers/errorhandlers/errorpayloadbuilders/EdifactErrorPayloadBuilderTest.java @@ -39,8 +39,8 @@ import static org.folio.ActionProfile.FolioRecord.INVOICE; import static org.folio.dataimport.util.RestUtil.OKAPI_URL_HEADER; import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_ERROR; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE; -import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE; +import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE; import static org.folio.rest.util.OkapiConnectionParams.OKAPI_TENANT_HEADER; import static org.folio.rest.util.OkapiConnectionParams.OKAPI_TOKEN_HEADER; import static org.folio.verticle.consumers.errorhandlers.RawMarcChunksErrorHandler.ERROR_KEY; diff --git a/ramls/raml-storage b/ramls/raml-storage index 938d9f8ac..8f35e1fa5 160000 --- a/ramls/raml-storage +++ b/ramls/raml-storage @@ -1 +1 @@ -Subproject commit 938d9f8aca487c70bb1a9a8c118df40266022ab2 +Subproject commit 8f35e1fa5902bab4792a2b4a5511e9eb2a860aef