From e7fb82ecfbf44721db245f509ec468188e5ba647 Mon Sep 17 00:00:00 2001
From: Volodymyr Rohach <Volodymyr_Rohach@epam.com>
Date: Thu, 30 May 2024 12:57:29 +0300
Subject: [PATCH] MODSOURCE-773: raml-storage dependency updated. (#727)

* MODSOURCE-733: raml-storage dependency updated.

* MODSOURCE-733: dependency on srs-client updated. Compilation errors fixed.
---
 pom.xml                                         |  4 ++--
 .../dataimport/HoldingsMapperFactory.java       |  3 ++-
 .../dataimport/ItemsMapperFactory.java          |  3 ++-
 .../actions/AbstractAuthorityEventHandler.java  |  8 ++++----
 .../actions/CreateAuthorityEventHandler.java    |  6 +++---
 .../actions/CreateHoldingEventHandler.java      |  2 +-
 .../actions/CreateInstanceEventHandler.java     |  2 +-
 .../actions/CreateItemEventHandler.java         |  2 +-
 .../actions/CreateMarcHoldingsEventHandler.java |  2 +-
 .../actions/DeleteAuthorityEventHandler.java    |  2 +-
 ...rcBibModifiedPostProcessingEventHandler.java |  2 +-
 .../actions/ReplaceInstanceEventHandler.java    |  2 +-
 .../actions/UpdateAuthorityEventHandler.java    |  5 +++--
 .../actions/UpdateHoldingEventHandler.java      |  2 +-
 .../actions/UpdateItemEventHandler.java         |  2 +-
 .../actions/UpdateMarcHoldingsEventHandler.java |  2 +-
 .../modify/AbstractModifyEventHandler.java      |  2 +-
 .../matching/AbstractMarcMatchEventHandler.java |  2 +-
 .../matching/AbstractMatchEventHandler.java     |  2 +-
 .../matching/CommonMatchEventHandler.java       |  4 ++--
 .../matching/loaders/AbstractLoader.java        |  8 ++++----
 .../services/OrderHelperServiceImpl.java        |  3 ++-
 .../cache/JobProfileSnapshotCacheTest.java      |  4 ++--
 .../DataImportConsumerVerticleTest.java         |  6 +++---
 .../consumers/DataImportKafkaHandlerTest.java   |  6 +++---
 .../CreateAuthorityEventHandlerTest.java        |  6 +++---
 .../actions/CreateHoldingEventHandlerTest.java  |  6 +++---
 .../actions/CreateInstanceEventHandlerTest.java |  6 +++---
 .../actions/CreateItemEventHandlerTest.java     |  6 +++---
 .../CreateMarcHoldingsEventHandlerTest.java     |  6 +++---
 .../DeleteAuthorityEventHandlerTest.java        |  4 ++--
 ...bModifiedPostProcessingEventHandlerTest.java |  4 ++--
 .../actions/MarcBibModifyEventHandlerTest.java  |  4 ++--
 .../ReplaceInstanceEventHandlerTest.java        |  6 +++---
 .../UpdateAuthorityEventHandlerTest.java        |  6 +++---
 .../actions/UpdateHoldingEventHandlerTest.java  |  6 +++---
 .../actions/UpdateItemEventHandlerTest.java     |  6 +++---
 .../UpdateMarcHoldingsEventHandlerTest.java     |  6 +++---
 .../matching/CommonMatchEventHandlerTest.java   | 17 +++++++++--------
 .../MarcBibliographicMatchEventHandlerTest.java |  2 +-
 .../services/OrderHelperServiceTest.java        |  6 +++---
 .../MatchAuthorityEventHandlerUnitTest.java     |  6 +++---
 .../MatchHoldingEventHandlerUnitTest.java       |  6 +++---
 .../MatchInstanceEventHandlerUnitTest.java      |  8 ++++----
 .../MatchItemEventHandlerUnitTest.java          |  6 +++---
 .../preloaders/HoldingsPreloaderTest.java       |  2 +-
 .../preloaders/InstancePreloaderTest.java       |  2 +-
 .../preloaders/ItemPreloaderTest.java           |  2 +-
 48 files changed, 110 insertions(+), 105 deletions(-)

diff --git a/pom.xml b/pom.xml
index bfa3c239a..8e36cfbb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,7 +219,7 @@
     <dependency>
       <groupId>org.folio</groupId>
       <artifactId>mod-source-record-storage-client</artifactId>
-      <version>5.8.0</version>
+      <version>5.9.0-SNAPSHOT</version>
       <exclusions>
         <!-- This is provided by JDK >= 9 causing a compile error (Eclipse doesn't suppress this compile error):
              "The package org.xml.sax is accessible from more than one module: <unnamed>, java.xml"
@@ -321,7 +321,7 @@
     <liquibase.version>4.9.1</liquibase.version>
     <kafkaclients.version>3.1.0</kafkaclients.version>
     <junit.version>4.13.2</junit.version>
-    <data-import-processing-core.version>4.2.0</data-import-processing-core.version>
+    <data-import-processing-core.version>4.3.0-SNAPSHOT</data-import-processing-core.version>
   </properties>
 
   <distributionManagement>
diff --git a/src/main/java/org/folio/inventory/dataimport/HoldingsMapperFactory.java b/src/main/java/org/folio/inventory/dataimport/HoldingsMapperFactory.java
index 2b1a9ce19..af15cd438 100644
--- a/src/main/java/org/folio/inventory/dataimport/HoldingsMapperFactory.java
+++ b/src/main/java/org/folio/inventory/dataimport/HoldingsMapperFactory.java
@@ -8,6 +8,7 @@
 import org.folio.processing.mapping.mapper.reader.Reader;
 import org.folio.processing.mapping.mapper.writer.Writer;
 import org.folio.rest.jaxrs.model.ProfileSnapshotWrapper;
+import org.folio.rest.jaxrs.model.ProfileType;
 
 import java.util.LinkedHashMap;
 
@@ -24,7 +25,7 @@ public Mapper createMapper(Reader reader, Writer writer) {
   public boolean isEligiblePayload(DataImportEventPayload eventPayload) {
     LinkedHashMap<String, String> map = (LinkedHashMap<String, String>) eventPayload.getCurrentNode().getContent();
     String existingRecordType = map.get(EXISTING_RECORD_TYPE);
-    return (ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE.equals(eventPayload.getCurrentNode().getContentType()))
+    return (ProfileType.MAPPING_PROFILE.equals(eventPayload.getCurrentNode().getContentType()))
       && (existingRecordType.equals(ActionProfile.FolioRecord.HOLDINGS.value()));
   }
 }
diff --git a/src/main/java/org/folio/inventory/dataimport/ItemsMapperFactory.java b/src/main/java/org/folio/inventory/dataimport/ItemsMapperFactory.java
index ad3def725..811b45596 100644
--- a/src/main/java/org/folio/inventory/dataimport/ItemsMapperFactory.java
+++ b/src/main/java/org/folio/inventory/dataimport/ItemsMapperFactory.java
@@ -8,6 +8,7 @@
 import org.folio.processing.mapping.mapper.reader.Reader;
 import org.folio.processing.mapping.mapper.writer.Writer;
 import org.folio.rest.jaxrs.model.ProfileSnapshotWrapper;
+import org.folio.rest.jaxrs.model.ProfileType;
 
 import java.util.LinkedHashMap;
 
@@ -24,7 +25,7 @@ public Mapper createMapper(Reader reader, Writer writer) {
   public boolean isEligiblePayload(DataImportEventPayload eventPayload) {
     LinkedHashMap<String, String> map = (LinkedHashMap<String, String>) eventPayload.getCurrentNode().getContent();
     String existingRecordType = map.get(EXISTING_RECORD_TYPE);
-    return (ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE.equals(eventPayload.getCurrentNode().getContentType()))
+    return (ProfileType.MAPPING_PROFILE.equals(eventPayload.getCurrentNode().getContentType()))
       && (existingRecordType.equals(ActionProfile.FolioRecord.ITEM.value()));
   }
 }
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/AbstractAuthorityEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/AbstractAuthorityEventHandler.java
index ed807c71c..12be75fd7 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/AbstractAuthorityEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/AbstractAuthorityEventHandler.java
@@ -5,8 +5,8 @@
 
 import static org.folio.inventory.dataimport.handlers.matching.util.EventHandlingUtil.constructContext;
 import static org.folio.inventory.dataimport.util.LoggerUtil.logParametersEventHandler;
-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 java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -36,7 +36,7 @@
 import org.folio.processing.mapping.defaultmapper.RecordMapperBuilder;
 import org.folio.processing.mapping.defaultmapper.processor.parameters.MappingParameters;
 import org.folio.rest.jaxrs.model.EntityType;
-import org.folio.rest.jaxrs.model.ProfileSnapshotWrapper;
+import org.folio.rest.jaxrs.model.ProfileType;
 import org.folio.rest.jaxrs.model.Record;
 
 public abstract class AbstractAuthorityEventHandler implements EventHandler {
@@ -118,7 +118,7 @@ public boolean isPostProcessingNeeded() {
 
   protected abstract ActionProfile.FolioRecord targetRecordType();
 
-  protected abstract ProfileSnapshotWrapper.ContentType profileContentType();
+  protected abstract ProfileType profileContentType();
 
   protected abstract void publishEvent(DataImportEventPayload payload);
 
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateAuthorityEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateAuthorityEventHandler.java
index a49a0201a..f507478df 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateAuthorityEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateAuthorityEventHandler.java
@@ -7,7 +7,7 @@
 import static org.folio.DataImportEventTypes.DI_INVENTORY_AUTHORITY_CREATED;
 import static org.folio.inventory.dataimport.util.DataImportConstants.UNIQUE_ID_ERROR_MESSAGE;
 import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_INVENTORY_AUTHORITY_CREATED_READY_FOR_POST_PROCESSING;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE;
 
 import io.vertx.core.Future;
 import io.vertx.core.Promise;
@@ -21,7 +21,7 @@
 import org.folio.inventory.services.IdStorageService;
 import org.folio.inventory.storage.Storage;
 import org.folio.kafka.exception.DuplicateEventException;
-import org.folio.rest.jaxrs.model.ProfileSnapshotWrapper;
+import org.folio.rest.jaxrs.model.ProfileType;
 
 public class CreateAuthorityEventHandler extends AbstractAuthorityEventHandler {
 
@@ -86,7 +86,7 @@ protected ActionProfile.FolioRecord targetRecordType() {
   }
 
   @Override
-  protected ProfileSnapshotWrapper.ContentType profileContentType() {
+  protected ProfileType profileContentType() {
     return ACTION_PROFILE;
   }
 
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateHoldingEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateHoldingEventHandler.java
index f6a04f961..cb83aedd1 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateHoldingEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateHoldingEventHandler.java
@@ -47,7 +47,7 @@
 import static org.folio.DataImportEventTypes.DI_INVENTORY_HOLDING_CREATED;
 import static org.folio.inventory.dataimport.handlers.matching.util.EventHandlingUtil.constructContext;
 import static org.folio.inventory.dataimport.util.DataImportConstants.UNIQUE_ID_ERROR_MESSAGE;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE;
 
 public class CreateHoldingEventHandler implements EventHandler {
 
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateInstanceEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateInstanceEventHandler.java
index 3f2092c2f..ed73ee426 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateInstanceEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateInstanceEventHandler.java
@@ -47,7 +47,7 @@
 import static org.folio.inventory.dataimport.util.LoggerUtil.logParametersEventHandler;
 import static org.folio.inventory.domain.instances.Instance.HRID_KEY;
 import static org.folio.inventory.domain.instances.Instance.SOURCE_KEY;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE;
 
 public class CreateInstanceEventHandler extends AbstractInstanceEventHandler {
 
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateItemEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateItemEventHandler.java
index 2577dc236..9d595dc17 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateItemEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateItemEventHandler.java
@@ -58,7 +58,7 @@
 import static org.folio.DataImportEventTypes.DI_INVENTORY_ITEM_CREATED;
 import static org.folio.inventory.dataimport.util.DataImportConstants.UNIQUE_ID_ERROR_MESSAGE;
 import static org.folio.inventory.dataimport.util.LoggerUtil.logParametersEventHandler;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE;
 
 public class CreateItemEventHandler implements EventHandler {
 
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateMarcHoldingsEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateMarcHoldingsEventHandler.java
index 61411d0e4..b62eecd5e 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateMarcHoldingsEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/CreateMarcHoldingsEventHandler.java
@@ -12,7 +12,7 @@
 import static org.folio.inventory.dataimport.util.DataImportConstants.UNIQUE_ID_ERROR_MESSAGE;
 import static org.folio.inventory.dataimport.util.LoggerUtil.logParametersEventHandler;
 import static org.folio.inventory.dataimport.util.ParsedRecordUtil.getControlFieldValue;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE;
 
 import java.util.HashMap;
 import java.util.UUID;
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/DeleteAuthorityEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/DeleteAuthorityEventHandler.java
index ff74a28bb..9c00f75ef 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/DeleteAuthorityEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/DeleteAuthorityEventHandler.java
@@ -24,7 +24,7 @@
 import static org.folio.ActionProfile.FolioRecord.MARC_AUTHORITY;
 import static org.folio.inventory.dataimport.handlers.matching.util.EventHandlingUtil.constructContext;
 import static org.folio.inventory.dataimport.util.LoggerUtil.logParametersEventHandler;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE;
 
 public class DeleteAuthorityEventHandler implements EventHandler {
   private static final Logger LOGGER = LogManager.getLogger(DeleteAuthorityEventHandler.class);
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/MarcBibModifiedPostProcessingEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/MarcBibModifiedPostProcessingEventHandler.java
index 1ecb0620b..b0b2aecf8 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/MarcBibModifiedPostProcessingEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/MarcBibModifiedPostProcessingEventHandler.java
@@ -35,7 +35,7 @@
 import static org.folio.inventory.dataimport.handlers.matching.util.EventHandlingUtil.getTenant;
 import static org.folio.inventory.dataimport.util.LoggerUtil.logParametersEventHandler;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE;
 
 public class MarcBibModifiedPostProcessingEventHandler implements EventHandler {
 
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/ReplaceInstanceEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/ReplaceInstanceEventHandler.java
index 4cf33f8f0..3312c40b7 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/ReplaceInstanceEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/ReplaceInstanceEventHandler.java
@@ -61,7 +61,7 @@
 import static org.folio.inventory.domain.instances.InstanceSource.CONSORTIUM_MARC;
 import static org.folio.inventory.domain.instances.InstanceSource.FOLIO;
 import static org.folio.inventory.domain.instances.InstanceSource.MARC;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE;
 
 
 public class ReplaceInstanceEventHandler extends AbstractInstanceEventHandler { // NOSONAR
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateAuthorityEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateAuthorityEventHandler.java
index 849bfe21f..2f8218030 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateAuthorityEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateAuthorityEventHandler.java
@@ -18,6 +18,7 @@
 import org.folio.processing.events.services.publisher.KafkaEventPublisher;
 import org.folio.processing.exceptions.EventProcessingException;
 import org.folio.rest.jaxrs.model.ProfileSnapshotWrapper;
+import org.folio.rest.jaxrs.model.ProfileType;
 
 import static java.lang.String.format;
 import static org.folio.ActionProfile.Action.UPDATE;
@@ -25,7 +26,7 @@
 import static org.folio.ActionProfile.FolioRecord.MARC_AUTHORITY;
 import static org.folio.DataImportEventTypes.DI_INVENTORY_AUTHORITY_UPDATED;
 import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_INVENTORY_AUTHORITY_UPDATED_READY_FOR_POST_PROCESSING;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE;
 
 public class UpdateAuthorityEventHandler extends AbstractAuthorityEventHandler {
   private static final int MAX_RETRIES_COUNT = Integer.parseInt(System.getenv().getOrDefault("inventory.di.ol.retry.number", "1"));
@@ -73,7 +74,7 @@ protected ActionProfile.FolioRecord targetRecordType() {
   }
 
   @Override
-  protected ProfileSnapshotWrapper.ContentType profileContentType() {
+  protected ProfileType profileContentType() {
     return MAPPING_PROFILE;
   }
 
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateHoldingEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateHoldingEventHandler.java
index 9179b2ca3..dc8e7616c 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateHoldingEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateHoldingEventHandler.java
@@ -50,7 +50,7 @@
 import static org.folio.inventory.dataimport.util.LoggerUtil.INCOMING_RECORD_ID;
 import static org.folio.inventory.dataimport.util.LoggerUtil.logParametersEventHandler;
 import static org.folio.rest.jaxrs.model.EntityType.ITEM;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateItemEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateItemEventHandler.java
index 52cf009cf..81183cc15 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateItemEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateItemEventHandler.java
@@ -76,7 +76,7 @@
 import static org.folio.rest.jaxrs.model.EntityType.HOLDINGS;
 import static org.folio.rest.jaxrs.model.EntityType.ITEM;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE;
 
 public class UpdateItemEventHandler implements EventHandler {
 
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateMarcHoldingsEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateMarcHoldingsEventHandler.java
index 89c52067a..124affe75 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateMarcHoldingsEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/UpdateMarcHoldingsEventHandler.java
@@ -13,7 +13,7 @@
 import static org.folio.inventory.dataimport.util.LoggerUtil.INCOMING_RECORD_ID;
 import static org.folio.inventory.dataimport.util.LoggerUtil.logParametersEventHandler;
 import static org.folio.inventory.dataimport.util.ParsedRecordUtil.getControlFieldValue;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MAPPING_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.MAPPING_PROFILE;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Optional;
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/actions/modify/AbstractModifyEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/actions/modify/AbstractModifyEventHandler.java
index 75b8908e2..794680942 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/actions/modify/AbstractModifyEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/actions/modify/AbstractModifyEventHandler.java
@@ -45,7 +45,7 @@
 import static org.folio.ActionProfile.FolioRecord.INSTANCE;
 import static org.folio.inventory.dataimport.handlers.matching.util.EventHandlingUtil.getTenant;
 import static org.folio.inventory.dataimport.util.LoggerUtil.logParametersEventHandler;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.ACTION_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.ACTION_PROFILE;
 
 public abstract class AbstractModifyEventHandler implements EventHandler {
   private static final Logger LOGGER = LogManager.getLogger(AbstractModifyEventHandler.class);
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/matching/AbstractMarcMatchEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/matching/AbstractMarcMatchEventHandler.java
index e44636dcb..66f824ed5 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/matching/AbstractMarcMatchEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/matching/AbstractMarcMatchEventHandler.java
@@ -46,7 +46,7 @@
 import static org.apache.http.HttpStatus.SC_OK;
 import static org.folio.processing.value.Value.ValueType.MISSING;
 import static org.folio.rest.jaxrs.model.MatchExpression.DataValueType.VALUE_FROM_RECORD;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE;
 
 public abstract class AbstractMarcMatchEventHandler implements EventHandler {
 
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/matching/AbstractMatchEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/matching/AbstractMatchEventHandler.java
index 7b39d7eb0..f442d36a0 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/matching/AbstractMatchEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/matching/AbstractMatchEventHandler.java
@@ -26,7 +26,7 @@
 import static org.folio.inventory.dataimport.handlers.matching.util.EventHandlingUtil.constructContext;
 import static org.folio.inventory.dataimport.handlers.matching.util.EventHandlingUtil.extractMatchProfile;
 import static org.folio.inventory.dataimport.util.LoggerUtil.logParametersEventHandler;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE;
 
 public abstract class AbstractMatchEventHandler implements EventHandler {
   private static final Logger LOGGER = LogManager.getLogger(AbstractMatchEventHandler.class);
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/matching/CommonMatchEventHandler.java b/src/main/java/org/folio/inventory/dataimport/handlers/matching/CommonMatchEventHandler.java
index 728529b15..643c0e719 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/matching/CommonMatchEventHandler.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/matching/CommonMatchEventHandler.java
@@ -18,8 +18,8 @@
 import static org.folio.rest.jaxrs.model.EntityType.INSTANCE;
 import static org.folio.rest.jaxrs.model.EntityType.ITEM;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ReactTo.MATCH;
+import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE;
+import static org.folio.rest.jaxrs.model.ReactToType.MATCH;
 
 /**
  * The implementation of the {@link EventHandler} that represents
diff --git a/src/main/java/org/folio/inventory/dataimport/handlers/matching/loaders/AbstractLoader.java b/src/main/java/org/folio/inventory/dataimport/handlers/matching/loaders/AbstractLoader.java
index af0d515b1..6606bef9e 100644
--- a/src/main/java/org/folio/inventory/dataimport/handlers/matching/loaders/AbstractLoader.java
+++ b/src/main/java/org/folio/inventory/dataimport/handlers/matching/loaders/AbstractLoader.java
@@ -15,8 +15,7 @@
 import org.folio.processing.matching.loader.query.LoadQuery;
 import org.folio.rest.jaxrs.model.EntityType;
 import org.folio.rest.jaxrs.model.ProfileSnapshotWrapper;
-import org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType;
-import org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ReactTo;
+import org.folio.rest.jaxrs.model.ReactToType;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -25,6 +24,7 @@
 import static java.lang.String.format;
 import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
 import static org.folio.inventory.dataimport.handlers.matching.util.EventHandlingUtil.constructContext;
+import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE;
 
 public abstract class AbstractLoader<T> implements MatchValueLoader {
 
@@ -97,8 +97,8 @@ private PagingParameters buildPagingParameters(boolean multiMatchLoadingParams)
 
   private boolean canProcessMultiMatchResult(DataImportEventPayload eventPayload) {
     List<ProfileSnapshotWrapper> childProfiles = eventPayload.getCurrentNode().getChildSnapshotWrappers();
-    return isNotEmpty(childProfiles) && ReactTo.MATCH.equals(childProfiles.get(0).getReactTo())
-      && ContentType.MATCH_PROFILE.equals(childProfiles.get(0).getContentType());
+    return isNotEmpty(childProfiles) && ReactToType.MATCH.equals(childProfiles.get(0).getReactTo())
+      && MATCH_PROFILE.equals(childProfiles.get(0).getContentType());
   }
 
   @Override
diff --git a/src/main/java/org/folio/inventory/dataimport/services/OrderHelperServiceImpl.java b/src/main/java/org/folio/inventory/dataimport/services/OrderHelperServiceImpl.java
index ece17321f..288f6d36d 100644
--- a/src/main/java/org/folio/inventory/dataimport/services/OrderHelperServiceImpl.java
+++ b/src/main/java/org/folio/inventory/dataimport/services/OrderHelperServiceImpl.java
@@ -12,6 +12,7 @@
 import org.folio.inventory.dataimport.cache.ProfileSnapshotCache;
 import org.folio.processing.exceptions.EventProcessingException;
 import org.folio.rest.jaxrs.model.ProfileSnapshotWrapper;
+import org.folio.rest.jaxrs.model.ProfileType;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -60,7 +61,7 @@ private CompletableFuture<Void> checkIfOrderLogicExistsAndFillPayloadIfNeeded(Da
     List<ProfileSnapshotWrapper> actionProfiles = profileSnapshotWrapper
       .getChildSnapshotWrappers()
       .stream()
-      .filter(e -> e.getContentType() == ProfileSnapshotWrapper.ContentType.ACTION_PROFILE)
+      .filter(e -> e.getContentType() == ProfileType.ACTION_PROFILE)
       .collect(Collectors.toList());
 
     if (!actionProfiles.isEmpty() && checkIfOrderActionProfileExists(actionProfiles) && checkIfCurrentProfileIsTheLastOne(eventPayload, actionProfiles)) {
diff --git a/src/test/java/org/folio/inventory/dataimport/cache/JobProfileSnapshotCacheTest.java b/src/test/java/org/folio/inventory/dataimport/cache/JobProfileSnapshotCacheTest.java
index 6a73732a0..37686e1b6 100644
--- a/src/test/java/org/folio/inventory/dataimport/cache/JobProfileSnapshotCacheTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/cache/JobProfileSnapshotCacheTest.java
@@ -1,8 +1,8 @@
 package org.folio.inventory.dataimport.cache;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
-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 java.util.List;
 import java.util.Optional;
diff --git a/src/test/java/org/folio/inventory/dataimport/consumers/DataImportConsumerVerticleTest.java b/src/test/java/org/folio/inventory/dataimport/consumers/DataImportConsumerVerticleTest.java
index 56d987446..f9204e122 100644
--- a/src/test/java/org/folio/inventory/dataimport/consumers/DataImportConsumerVerticleTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/consumers/DataImportConsumerVerticleTest.java
@@ -60,9 +60,9 @@
 import static org.folio.kafka.KafkaTopicNameHelper.getDefaultNameSpace;
 import static org.folio.rest.jaxrs.model.EntityType.INSTANCE;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
-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.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/org/folio/inventory/dataimport/consumers/DataImportKafkaHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/consumers/DataImportKafkaHandlerTest.java
index f13e116d3..3529b870e 100644
--- a/src/test/java/org/folio/inventory/dataimport/consumers/DataImportKafkaHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/consumers/DataImportKafkaHandlerTest.java
@@ -53,9 +53,9 @@
 import static org.folio.DataImportEventTypes.DI_INCOMING_MARC_BIB_RECORD_PARSED;
 import static org.folio.rest.jaxrs.model.EntityType.INSTANCE;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
-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.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateAuthorityEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateAuthorityEventHandlerTest.java
index 2c133487e..aa048a8b7 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateAuthorityEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateAuthorityEventHandlerTest.java
@@ -17,9 +17,9 @@
 import static org.folio.ActionProfile.FolioRecord.MARC_AUTHORITY;
 import static org.folio.DataImportEventTypes.DI_INVENTORY_AUTHORITY_CREATED;
 import static org.folio.DataImportEventTypes.DI_SRS_MARC_AUTHORITY_RECORD_CREATED;
-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 io.vertx.core.Future;
 import java.io.IOException;
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateHoldingEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateHoldingEventHandlerTest.java
index 7ab02f86a..c3c0b4c18 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateHoldingEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateHoldingEventHandlerTest.java
@@ -70,9 +70,9 @@
 import static org.folio.DataImportEventTypes.DI_INCOMING_MARC_BIB_RECORD_PARSED;
 import static org.folio.inventory.dataimport.handlers.actions.CreateHoldingEventHandler.ACTION_HAS_NO_MAPPING_MSG;
 import static org.folio.inventory.dataimport.util.DataImportConstants.UNIQUE_ID_ERROR_MESSAGE;
-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.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateInstanceEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateInstanceEventHandlerTest.java
index 0a44ab146..32ea6894b 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateInstanceEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateInstanceEventHandlerTest.java
@@ -86,9 +86,9 @@
 import static org.folio.inventory.dataimport.util.AdditionalFieldsUtil.TAG_005;
 import static org.folio.inventory.dataimport.util.AdditionalFieldsUtil.dateTime005Formatter;
 import static org.folio.inventory.dataimport.util.DataImportConstants.UNIQUE_ID_ERROR_MESSAGE;
-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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateItemEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateItemEventHandlerTest.java
index e0a65e189..749e5870c 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateItemEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateItemEventHandlerTest.java
@@ -68,9 +68,9 @@
 import static org.folio.inventory.dataimport.util.DataImportConstants.UNIQUE_ID_ERROR_MESSAGE;
 import static org.folio.inventory.domain.items.ItemStatusName.AVAILABLE;
 import static org.folio.rest.jaxrs.model.EntityType.ITEM;
-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.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.argThat;
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateMarcHoldingsEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateMarcHoldingsEventHandlerTest.java
index 4c10769f4..479a987b1 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateMarcHoldingsEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/actions/CreateMarcHoldingsEventHandlerTest.java
@@ -17,9 +17,9 @@
 import static org.folio.DataImportEventTypes.DI_INVENTORY_HOLDING_CREATED;
 import static org.folio.DataImportEventTypes.DI_SRS_MARC_HOLDING_RECORD_CREATED;
 import static org.folio.inventory.dataimport.handlers.actions.CreateHoldingEventHandler.ACTION_HAS_NO_MAPPING_MSG;
-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 io.vertx.core.Future;
 
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/actions/DeleteAuthorityEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/actions/DeleteAuthorityEventHandlerTest.java
index e7a412224..e2178516d 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/actions/DeleteAuthorityEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/actions/DeleteAuthorityEventHandlerTest.java
@@ -31,8 +31,8 @@
 import static org.folio.ActionProfile.FolioRecord.MARC_AUTHORITY;
 import static org.folio.ActionProfile.FolioRecord.ITEM;
 import static org.folio.DataImportEventTypes.DI_SRS_MARC_AUTHORITY_RECORD_DELETED;
-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.assertTrue;
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/actions/MarcBibModifiedPostProcessingEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/actions/MarcBibModifiedPostProcessingEventHandlerTest.java
index dabe45888..3e4d405a5 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/actions/MarcBibModifiedPostProcessingEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/actions/MarcBibModifiedPostProcessingEventHandlerTest.java
@@ -50,8 +50,8 @@
 import static org.folio.DataImportEventTypes.DI_SRS_MARC_BIB_RECORD_MODIFIED_READY_FOR_POST_PROCESSING;
 import static org.folio.rest.jaxrs.model.EntityType.INSTANCE;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
-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.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/actions/MarcBibModifyEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/actions/MarcBibModifyEventHandlerTest.java
index e7835ebf0..7864255c7 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/actions/MarcBibModifyEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/actions/MarcBibModifyEventHandlerTest.java
@@ -60,8 +60,8 @@
 import static org.folio.DataImportEventTypes.DI_SRS_MARC_BIB_RECORD_MODIFIED;
 import static org.folio.rest.jaxrs.model.EntityType.INSTANCE;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
-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.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/actions/ReplaceInstanceEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/actions/ReplaceInstanceEventHandlerTest.java
index d36460f71..01eca0f72 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/actions/ReplaceInstanceEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/actions/ReplaceInstanceEventHandlerTest.java
@@ -95,9 +95,9 @@
 import static org.folio.inventory.domain.instances.InstanceSource.FOLIO;
 import static org.folio.inventory.domain.instances.InstanceSource.MARC;
 import static org.folio.inventory.domain.instances.titles.PrecedingSucceedingTitle.TITLE_KEY;
-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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateAuthorityEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateAuthorityEventHandlerTest.java
index 8a32d72c2..ff73de23d 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateAuthorityEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateAuthorityEventHandlerTest.java
@@ -53,9 +53,9 @@
 import static org.folio.DataImportEventTypes.DI_INVENTORY_AUTHORITY_MATCHED;
 import static org.folio.DataImportEventTypes.DI_INVENTORY_AUTHORITY_UPDATED;
 import static org.folio.rest.jaxrs.model.DataImportEventTypes.DI_INVENTORY_AUTHORITY_UPDATED_READY_FOR_POST_PROCESSING;
-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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateHoldingEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateHoldingEventHandlerTest.java
index 2e3a2f9bf..b47c5cba7 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateHoldingEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateHoldingEventHandlerTest.java
@@ -67,9 +67,9 @@
 import static org.folio.inventory.dataimport.handlers.actions.UpdateHoldingEventHandler.ACTION_HAS_NO_MAPPING_MSG;
 import static org.folio.inventory.dataimport.handlers.actions.UpdateHoldingEventHandler.CURRENT_RETRY_NUMBER;
 import static org.folio.inventory.domain.items.ItemStatusName.AVAILABLE;
-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.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateItemEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateItemEventHandlerTest.java
index 0b6c4b8a9..366d1c625 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateItemEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateItemEventHandlerTest.java
@@ -80,9 +80,9 @@
 import static org.folio.rest.jaxrs.model.EntityType.HOLDINGS;
 import static org.folio.rest.jaxrs.model.EntityType.ITEM;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
-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.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateMarcHoldingsEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateMarcHoldingsEventHandlerTest.java
index b3f806bec..08ef02840 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateMarcHoldingsEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/actions/UpdateMarcHoldingsEventHandlerTest.java
@@ -24,9 +24,9 @@
 import static org.folio.DataImportEventTypes.DI_INVENTORY_HOLDING_CREATED;
 import static org.folio.DataImportEventTypes.DI_INVENTORY_HOLDING_MATCHED;
 import static org.folio.DataImportEventTypes.DI_INVENTORY_HOLDING_UPDATED;
-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 java.io.IOException;
 import java.io.UnsupportedEncodingException;
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/matching/CommonMatchEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/matching/CommonMatchEventHandlerTest.java
index 2a3d271e9..2aead146d 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/matching/CommonMatchEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/matching/CommonMatchEventHandlerTest.java
@@ -13,6 +13,7 @@
 import org.folio.processing.exceptions.EventProcessingException;
 import org.folio.rest.jaxrs.model.EntityType;
 import org.folio.rest.jaxrs.model.ProfileSnapshotWrapper;
+import org.folio.rest.jaxrs.model.ReactToType;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,8 +38,8 @@
 import static org.folio.rest.jaxrs.model.EntityType.ITEM;
 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.ProfileSnapshotWrapper.ContentType.ACTION_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.MATCH_PROFILE;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -86,7 +87,7 @@ public void shouldCallMatchInstanceEventHandlerIfCurrentNodeIsMatchInstanceProfi
       .withExistingRecordType(INSTANCE);
 
     ProfileSnapshotWrapper instanceMatchProfileWrapper = new ProfileSnapshotWrapper()
-      .withReactTo(ProfileSnapshotWrapper.ReactTo.MATCH)
+      .withReactTo(ReactToType.MATCH)
       .withContentType(MATCH_PROFILE)
       .withContent(JsonObject.mapFrom(instanceMatchProfile).getMap());
 
@@ -117,7 +118,7 @@ public void shouldCallMatchHoldingsEventHandlerIfCurrentNodeIsMatchHoldingsProfi
       .withExistingRecordType(HOLDINGS);
 
     ProfileSnapshotWrapper instanceMatchProfileWrapper = new ProfileSnapshotWrapper()
-      .withReactTo(ProfileSnapshotWrapper.ReactTo.MATCH)
+      .withReactTo(ReactToType.MATCH)
       .withContentType(MATCH_PROFILE)
       .withContent(JsonObject.mapFrom(instanceMatchProfile).getMap());
 
@@ -148,7 +149,7 @@ public void shouldCallMatchItemEventHandlerIfCurrentNodeIsMatchItemProfile() thr
       .withExistingRecordType(ITEM);
 
     ProfileSnapshotWrapper instanceMatchProfileWrapper = new ProfileSnapshotWrapper()
-      .withReactTo(ProfileSnapshotWrapper.ReactTo.MATCH)
+      .withReactTo(ReactToType.MATCH)
       .withContentType(MATCH_PROFILE)
       .withContent(JsonObject.mapFrom(instanceMatchProfile).getMap());
 
@@ -180,7 +181,7 @@ public void shouldCallMatchMarcBibEventHandlerIfCurrentNodeIsMatchMarcBibProfile
       .withExistingRecordType(MARC_BIBLIOGRAPHIC);
 
     ProfileSnapshotWrapper instanceMatchProfileWrapper = new ProfileSnapshotWrapper()
-      .withReactTo(ProfileSnapshotWrapper.ReactTo.MATCH)
+      .withReactTo(ReactToType.MATCH)
       .withContentType(MATCH_PROFILE)
       .withContent(JsonObject.mapFrom(instanceMatchProfile).getMap());
 
@@ -215,7 +216,7 @@ public void shouldCallMatchInstanceHandlerIfMultipleMarcBibMatchResultOccursAndN
       .withExistingRecordType(INSTANCE);
 
     ProfileSnapshotWrapper instanceMatchProfileWrapper = new ProfileSnapshotWrapper()
-      .withReactTo(ProfileSnapshotWrapper.ReactTo.MATCH)
+      .withReactTo(ReactToType.MATCH)
       .withContentType(MATCH_PROFILE)
       .withContent(JsonObject.mapFrom(instanceMatchProfile).getMap());
 
@@ -276,7 +277,7 @@ public void shouldCallMatchHoldingHandlerIfMultipleMarcBibMatchResultOccursAndNe
       .withExistingRecordType(HOLDINGS);
 
     ProfileSnapshotWrapper holdingsMatchProfileWrapper = new ProfileSnapshotWrapper()
-      .withReactTo(ProfileSnapshotWrapper.ReactTo.MATCH)
+      .withReactTo(ReactToType.MATCH)
       .withContentType(MATCH_PROFILE)
       .withContent(JsonObject.mapFrom(holdingsMatchProfile).getMap());
 
diff --git a/src/test/java/org/folio/inventory/dataimport/handlers/matching/MarcBibliographicMatchEventHandlerTest.java b/src/test/java/org/folio/inventory/dataimport/handlers/matching/MarcBibliographicMatchEventHandlerTest.java
index 4c2e5cc01..08fcea17f 100644
--- a/src/test/java/org/folio/inventory/dataimport/handlers/matching/MarcBibliographicMatchEventHandlerTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/handlers/matching/MarcBibliographicMatchEventHandlerTest.java
@@ -73,7 +73,7 @@
 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.MatchExpression.DataValueType.VALUE_FROM_RECORD;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/org/folio/inventory/dataimport/services/OrderHelperServiceTest.java b/src/test/java/org/folio/inventory/dataimport/services/OrderHelperServiceTest.java
index f2ecd2126..72f17e8c1 100644
--- a/src/test/java/org/folio/inventory/dataimport/services/OrderHelperServiceTest.java
+++ b/src/test/java/org/folio/inventory/dataimport/services/OrderHelperServiceTest.java
@@ -47,9 +47,9 @@
 import static org.folio.rest.jaxrs.model.EntityType.INSTANCE;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
 import static org.folio.rest.jaxrs.model.EntityType.ORDER;
-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.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/org/folio/inventory/eventhandlers/MatchAuthorityEventHandlerUnitTest.java b/src/test/java/org/folio/inventory/eventhandlers/MatchAuthorityEventHandlerUnitTest.java
index d45c0d56c..274ade02f 100644
--- a/src/test/java/org/folio/inventory/eventhandlers/MatchAuthorityEventHandlerUnitTest.java
+++ b/src/test/java/org/folio/inventory/eventhandlers/MatchAuthorityEventHandlerUnitTest.java
@@ -61,9 +61,9 @@
 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.MatchExpression.DataValueType.VALUE_FROM_RECORD;
-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.MATCH;
+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.MATCH;
 import static org.hamcrest.Matchers.hasItems;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/org/folio/inventory/eventhandlers/MatchHoldingEventHandlerUnitTest.java b/src/test/java/org/folio/inventory/eventhandlers/MatchHoldingEventHandlerUnitTest.java
index 1a7d5f689..57b8b9f37 100644
--- a/src/test/java/org/folio/inventory/eventhandlers/MatchHoldingEventHandlerUnitTest.java
+++ b/src/test/java/org/folio/inventory/eventhandlers/MatchHoldingEventHandlerUnitTest.java
@@ -23,9 +23,9 @@
 import static org.folio.rest.jaxrs.model.EntityType.ITEM;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
 import static org.folio.rest.jaxrs.model.MatchExpression.DataValueType.VALUE_FROM_RECORD;
-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.MATCH;
+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.MATCH;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
diff --git a/src/test/java/org/folio/inventory/eventhandlers/MatchInstanceEventHandlerUnitTest.java b/src/test/java/org/folio/inventory/eventhandlers/MatchInstanceEventHandlerUnitTest.java
index cb365a976..cc0e29b44 100644
--- a/src/test/java/org/folio/inventory/eventhandlers/MatchInstanceEventHandlerUnitTest.java
+++ b/src/test/java/org/folio/inventory/eventhandlers/MatchInstanceEventHandlerUnitTest.java
@@ -24,10 +24,10 @@
 import static org.folio.rest.jaxrs.model.EntityType.INSTANCE;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
 import static org.folio.rest.jaxrs.model.MatchExpression.DataValueType.VALUE_FROM_RECORD;
-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.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ReactTo.MATCH;
+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;
+import static org.folio.rest.jaxrs.model.ReactToType.MATCH;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
diff --git a/src/test/java/org/folio/inventory/eventhandlers/MatchItemEventHandlerUnitTest.java b/src/test/java/org/folio/inventory/eventhandlers/MatchItemEventHandlerUnitTest.java
index 63228b8b1..1a0c448bf 100644
--- a/src/test/java/org/folio/inventory/eventhandlers/MatchItemEventHandlerUnitTest.java
+++ b/src/test/java/org/folio/inventory/eventhandlers/MatchItemEventHandlerUnitTest.java
@@ -23,9 +23,9 @@
 import static org.folio.rest.jaxrs.model.EntityType.ITEM;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
 import static org.folio.rest.jaxrs.model.MatchExpression.DataValueType.VALUE_FROM_RECORD;
-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.MATCH;
+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.MATCH;
 
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
diff --git a/src/test/java/org/folio/inventory/eventhandlers/preloaders/HoldingsPreloaderTest.java b/src/test/java/org/folio/inventory/eventhandlers/preloaders/HoldingsPreloaderTest.java
index 622b01e7a..8241fd046 100644
--- a/src/test/java/org/folio/inventory/eventhandlers/preloaders/HoldingsPreloaderTest.java
+++ b/src/test/java/org/folio/inventory/eventhandlers/preloaders/HoldingsPreloaderTest.java
@@ -9,7 +9,7 @@
 import static org.folio.rest.jaxrs.model.EntityType.HOLDINGS;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
 import static org.folio.rest.jaxrs.model.MatchExpression.DataValueType.VALUE_FROM_RECORD;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/test/java/org/folio/inventory/eventhandlers/preloaders/InstancePreloaderTest.java b/src/test/java/org/folio/inventory/eventhandlers/preloaders/InstancePreloaderTest.java
index aa86216cd..3d8d9fa8c 100644
--- a/src/test/java/org/folio/inventory/eventhandlers/preloaders/InstancePreloaderTest.java
+++ b/src/test/java/org/folio/inventory/eventhandlers/preloaders/InstancePreloaderTest.java
@@ -9,7 +9,7 @@
 import static org.folio.rest.jaxrs.model.EntityType.INSTANCE;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
 import static org.folio.rest.jaxrs.model.MatchExpression.DataValueType.VALUE_FROM_RECORD;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/src/test/java/org/folio/inventory/eventhandlers/preloaders/ItemPreloaderTest.java b/src/test/java/org/folio/inventory/eventhandlers/preloaders/ItemPreloaderTest.java
index f0b75a426..321f8e7f1 100644
--- a/src/test/java/org/folio/inventory/eventhandlers/preloaders/ItemPreloaderTest.java
+++ b/src/test/java/org/folio/inventory/eventhandlers/preloaders/ItemPreloaderTest.java
@@ -9,7 +9,7 @@
 import static org.folio.rest.jaxrs.model.EntityType.ITEM;
 import static org.folio.rest.jaxrs.model.EntityType.MARC_BIBLIOGRAPHIC;
 import static org.folio.rest.jaxrs.model.MatchExpression.DataValueType.VALUE_FROM_RECORD;
-import static org.folio.rest.jaxrs.model.ProfileSnapshotWrapper.ContentType.MATCH_PROFILE;
+import static org.folio.rest.jaxrs.model.ProfileType.MATCH_PROFILE;
 
 import java.util.List;
 import java.util.Optional;