MODSOURCE-773: raml-storage dependency updated. (#727)

* MODSOURCE-733: raml-storage dependency updated. * MODSOURCE-733: dependency on srs-client updated. Compilation errors fixed.
folio-org · May 30, 2024 · e7fb82e · e7fb82e
1 parent 2b91a0b
commit e7fb82e
Show file tree

Hide file tree

Showing 48 changed files with 110 additions and 105 deletions.
diff --git 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
@@ -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
@@ -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/...n/java/org/folio/inventory/dataimport/handlers/actions/AbstractAuthorityEventHandler.java b/...n/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/...ain/java/org/folio/inventory/dataimport/handlers/actions/CreateAuthorityEventHandler.java b/...ain/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
@@ -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/...main/java/org/folio/inventory/dataimport/handlers/actions/CreateInstanceEventHandler.java b/...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
@@ -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/.../java/org/folio/inventory/dataimport/handlers/actions/CreateMarcHoldingsEventHandler.java b/.../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/...ain/java/org/folio/inventory/dataimport/handlers/actions/DeleteAuthorityEventHandler.java b/...ain/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/...olio/inventory/dataimport/handlers/actions/MarcBibModifiedPostProcessingEventHandler.java b/...olio/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/...ain/java/org/folio/inventory/dataimport/handlers/actions/ReplaceInstanceEventHandler.java b/...ain/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/...ain/java/org/folio/inventory/dataimport/handlers/actions/UpdateAuthorityEventHandler.java b/...ain/java/org/folio/inventory/dataimport/handlers/actions/UpdateAuthorityEventHandler.java
@@ -18,14 +18,15 @@
 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;
 import static org.folio.ActionProfile.FolioRecord.AUTHORITY;
 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
@@ -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
@@ -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/.../java/org/folio/inventory/dataimport/handlers/actions/UpdateMarcHoldingsEventHandler.java b/.../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/...va/org/folio/inventory/dataimport/handlers/actions/modify/AbstractModifyEventHandler.java b/...va/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/.../java/org/folio/inventory/dataimport/handlers/matching/AbstractMarcMatchEventHandler.java b/.../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/...main/java/org/folio/inventory/dataimport/handlers/matching/AbstractMatchEventHandler.java b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...java/org/folio/inventory/dataimport/handlers/actions/CreateAuthorityEventHandlerTest.java b/...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/...t/java/org/folio/inventory/dataimport/handlers/actions/CreateHoldingEventHandlerTest.java b/...t/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;