diff --git a/mod-source-record-storage-server/src/test/java/org/folio/consumers/AuthorityDomainKafkaHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/consumers/AuthorityDomainKafkaHandlerTest.java index 03151fd0a..455894eaf 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/consumers/AuthorityDomainKafkaHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/consumers/AuthorityDomainKafkaHandlerTest.java @@ -56,10 +56,7 @@ public static void setUpClass() throws IOException { .withContent( new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), - JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); } @Before diff --git a/mod-source-record-storage-server/src/test/java/org/folio/dao/RecordDaoImplTest.java b/mod-source-record-storage-server/src/test/java/org/folio/dao/RecordDaoImplTest.java index 78e3b2432..c02f35bbd 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/dao/RecordDaoImplTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/dao/RecordDaoImplTest.java @@ -59,7 +59,7 @@ public void setUp(TestContext context) throws IOException { RawRecord rawRecord = new RawRecord() .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); ParsedRecord marcRecord = new ParsedRecord() - .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class).encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); Snapshot snapshot = TestMocks.getSnapshot(0); String recordId = UUID.randomUUID().toString(); diff --git a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/RecordApiTest.java b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/RecordApiTest.java index 89c9021c2..d0a6fb149 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/RecordApiTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/RecordApiTest.java @@ -65,7 +65,7 @@ public class RecordApiTest extends AbstractRestVerticleTest { rawMarcRecord = new RawRecord() .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); parsedMarcRecord = new ParsedRecord() - .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class).encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); rawEdifactRecord = new RawRecord() .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_EDIFACT_RECORD_CONTENT_SAMPLE_PATH), String.class)); parsedEdifactRecord = new ParsedRecord() diff --git a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/RecordsGenerationTest.java b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/RecordsGenerationTest.java index 60a1b3e58..b4a1c108a 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/RecordsGenerationTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/RecordsGenerationTest.java @@ -44,7 +44,7 @@ public class RecordsGenerationTest extends AbstractRestVerticleTest { rawRecord = new RawRecord() .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); marcRecord = new ParsedRecord() - .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class).encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); } catch (IOException e) { e.printStackTrace(); } diff --git a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/RecordsMatchingApiTest.java b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/RecordsMatchingApiTest.java index 313d05d7d..7ce732328 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/RecordsMatchingApiTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/RecordsMatchingApiTest.java @@ -279,7 +279,8 @@ public void shouldMatchRecordByMultiple024FieldsWithWildcardsInd() { @Test public void shouldNotMatchRecordBy035FieldIfRecordExternalIdIsNull(TestContext context) throws IOException { - String parsedRecordContent = new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_WITH_035_FIELD_SAMPLE_PATH), JsonObject.class).encode(); +// String parsedRecordContent = new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_WITH_035_FIELD_SAMPLE_PATH), JsonObject.class).encode(); + String parsedRecordContent = TestUtil.readFileFromPath(PARSED_MARC_WITH_035_FIELD_SAMPLE_PATH); String recordId = UUID.randomUUID().toString(); Record record = new Record() .withId(recordId) @@ -312,7 +313,7 @@ public void shouldNotMatchRecordBy035FieldIfRecordExternalIdIsNull(TestContext c @Test public void shouldReturnLimitedRecordsIdentifiersCollectionWithLimitAndOffset(TestContext context) throws IOException { - String parsedRecordContent = new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_WITH_035_FIELD_SAMPLE_PATH), JsonObject.class).encode(); + String parsedRecordContent = TestUtil.readFileFromPath(PARSED_MARC_WITH_035_FIELD_SAMPLE_PATH); List recordsIds = List.of("00000000-0000-1000-8000-000000000004", "00000000-0000-1000-8000-000000000002", "00000000-0000-1000-8000-000000000003", "00000000-0000-1000-8000-000000000001"); diff --git a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceRecordApiTest.java b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceRecordApiTest.java index 0e4bbdf66..3dc98b36d 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceRecordApiTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceRecordApiTest.java @@ -89,9 +89,7 @@ public class SourceRecordApiTest extends AbstractRestVerticleTest { .withContent( new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); marcRecord = new ParsedRecord() - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); rawEdifactRecord = new RawRecord() .withContent( new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_EDIFACT_RECORD_CONTENT_SAMPLE_PATH), String.class)); diff --git a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceStorageBatchApiTest.java b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceStorageBatchApiTest.java index 5cbafe685..ce8d9a661 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceStorageBatchApiTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceStorageBatchApiTest.java @@ -80,7 +80,7 @@ public class SourceStorageBatchApiTest extends AbstractRestVerticleTest { rawRecord = new RawRecord() .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); marcRecord = new ParsedRecord() - .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class).encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); } catch (IOException e) { e.printStackTrace(); } diff --git a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceStorageStreamApiTest.java b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceStorageStreamApiTest.java index a5fe13b10..fc84e4a7a 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceStorageStreamApiTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/rest/impl/SourceStorageStreamApiTest.java @@ -71,7 +71,7 @@ public class SourceStorageStreamApiTest extends AbstractRestVerticleTest { rawRecord = new RawRecord() .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); marcRecord = new ParsedRecord() - .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class).encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); } catch (IOException e) { e.printStackTrace(); } diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/QuickMarcKafkaHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/QuickMarcKafkaHandlerTest.java index 383b155ea..7ba9d917d 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/QuickMarcKafkaHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/QuickMarcKafkaHandlerTest.java @@ -70,9 +70,7 @@ public static void setUpClass() throws IOException { .withContent( new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); } @Before diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/RecordServiceTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/RecordServiceTest.java index a1da2b8e1..1a63071ec 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/RecordServiceTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/RecordServiceTest.java @@ -90,7 +90,7 @@ public void setUp(TestContext context) throws IOException { rawRecord = new RawRecord() .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); marcRecord = new ParsedRecord() - .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class).encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); recordDao = new RecordDaoImpl(postgresClientFactory); recordService = new RecordServiceImpl(recordDao); @@ -686,7 +686,7 @@ public void shouldSaveMarcBibRecordWithMatchedIdFromExistingSourceRecord(TestCon .withMetadata(original.getMetadata()); ParsedRecord parsedRecord2 = new ParsedRecord() - .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class).encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); String recordId2 = UUID.randomUUID().toString(); Record record2 = new Record() .withId(recordId2) diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/AbstractPostProcessingEventHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/AbstractPostProcessingEventHandlerTest.java index e9a7b75c7..02f23b99c 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/AbstractPostProcessingEventHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/AbstractPostProcessingEventHandlerTest.java @@ -87,9 +87,7 @@ public static void setUpClass() throws IOException { .withContent( new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); } @Before diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/AuthorityPostProcessingEventHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/AuthorityPostProcessingEventHandlerTest.java index e04c3651e..98b906a2a 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/AuthorityPostProcessingEventHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/AuthorityPostProcessingEventHandlerTest.java @@ -170,9 +170,7 @@ public void shouldSaveRecordWhenRecordDoesntExist(TestContext context) throws IO .withContent( new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); ParsedRecord parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); Record defaultRecord = new Record() .withId(recordId) @@ -285,9 +283,7 @@ public void shouldUpdateField005WhenThisFiledIsNotProtected(TestContext context) .withContent( new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); ParsedRecord parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); Record defaultRecord = new Record() .withId(recordId) @@ -346,9 +342,7 @@ public void shouldUpdateField005WhenThisFiledIsProtected(TestContext context) th .withContent( new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); ParsedRecord parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); Record defaultRecord = new Record() .withId(recordId) diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/HoldingsPostProcessingEventHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/HoldingsPostProcessingEventHandlerTest.java index 6384883f1..ec677b18d 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/HoldingsPostProcessingEventHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/HoldingsPostProcessingEventHandlerTest.java @@ -128,9 +128,7 @@ public void shouldSaveRecordWhenRecordDoesntExist(TestContext context) throws IO .withContent( new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); ParsedRecord parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); Record defaultRecord = new Record() .withId(recordId) @@ -243,9 +241,7 @@ public void shouldUpdateField005WhenThisFiledIsNotProtected(TestContext context) .withContent( new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); ParsedRecord parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); Record defaultRecord = new Record() .withId(recordId) @@ -305,9 +301,7 @@ public void shouldUpdateField005WhenThisFiledIsProtected(TestContext context) th .withContent( new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); ParsedRecord parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); Record defaultRecord = new Record() .withId(recordId) diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/InstancePostProcessingEventHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/InstancePostProcessingEventHandlerTest.java index b8e333f68..86152115f 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/InstancePostProcessingEventHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/handlers/InstancePostProcessingEventHandlerTest.java @@ -252,9 +252,7 @@ public void shouldSaveRecordWhenRecordDoesntExist(TestContext context) throws IO RawRecord rawRecord = new RawRecord().withId(recordId) .withContent(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH)); ParsedRecord parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); Record defaultRecord = new Record() .withId(recordId) @@ -314,9 +312,7 @@ public void shouldReturnExceptionForDuplicateRecord(TestContext context) throws RawRecord rawRecord = new RawRecord().withId(recordId) .withContent(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH)); ParsedRecord parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); Record defaultRecord = new Record() .withId(recordId) @@ -329,9 +325,7 @@ public void shouldReturnExceptionForDuplicateRecord(TestContext context) throws RawRecord rawRecordDuplicate = new RawRecord().withId(recordId) .withContent(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH)); ParsedRecord parsedRecordDuplicate = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); Record duplicateRecord = new Record() .withId(duplicateRecordId) @@ -405,9 +399,7 @@ public void shouldSaveIncomingRecordAndMarkExistingAsOldWhenIncomingRecordHasSam RawRecord rawRecord = new RawRecord().withId(recordId) .withContent(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH)); ParsedRecord parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); Record incomingRecord = new Record() .withRawRecord(rawRecord) @@ -568,9 +560,7 @@ public void shouldUpdateField005WhenThisFiledIsNotProtected(TestContext context) .withContent( new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); ParsedRecord parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); Record defaultRecord = new Record() .withId(recordId) @@ -630,9 +620,7 @@ public void shouldUpdateField005WhenThisFiledIsProtected(TestContext context) th .withContent( new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); ParsedRecord parsedRecord = new ParsedRecord().withId(recordId) - .withContent( - new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class) - .encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); Record defaultRecord = new Record() .withId(recordId) diff --git a/mod-source-record-storage-server/src/test/java/org/folio/verticle/consumers/ParsedRecordChunkConsumersVerticleTest.java b/mod-source-record-storage-server/src/test/java/org/folio/verticle/consumers/ParsedRecordChunkConsumersVerticleTest.java index ffa37faeb..010cda28c 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/verticle/consumers/ParsedRecordChunkConsumersVerticleTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/verticle/consumers/ParsedRecordChunkConsumersVerticleTest.java @@ -75,7 +75,7 @@ public static void loadMockRecords(TestContext context) throws IOException { rawMarcRecord = new RawRecord() .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_MARC_RECORD_CONTENT_SAMPLE_PATH), String.class)); parsedMarcRecord = new ParsedRecord() - .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH), JsonObject.class).encode()); + .withContent(TestUtil.readFileFromPath(PARSED_MARC_RECORD_CONTENT_SAMPLE_PATH)); rawEdifactRecord = new RawRecord() .withContent(new ObjectMapper().readValue(TestUtil.readFileFromPath(RAW_EDIFACT_RECORD_CONTENT_SAMPLE_PATH), String.class)); parsedEdifactRecord = new ParsedRecord() diff --git a/mod-source-record-storage-server/src/test/resources/parsedMarcRecordContent.sample b/mod-source-record-storage-server/src/test/resources/parsedMarcRecordContent.sample index e5ff79c08..e91e17b3c 100644 --- a/mod-source-record-storage-server/src/test/resources/parsedMarcRecordContent.sample +++ b/mod-source-record-storage-server/src/test/resources/parsedMarcRecordContent.sample @@ -1 +1,433 @@ -"{\"leader\":\"01542ccm a2200361 4500\",\"fields\":[{\"001\":\"393893\"},{\"005\":\"20141107001016.0\"},{\"008\":\"830419m19559999gw mua hiz n lat \"},{\"010\":{\"subfields\":[{\"a\":\" 55001156/M \"}],\"ind1\":\"\",\"ind2\":\" \"}},{\"035\":{\"subfields\":[{\"a\":\"(OCoLC)63611770\"}],\"ind1\":\" \",\"ind2\":\" \"}},{\"035\":{\"subfields\":[{\"a\":\"393893\"}],\"ind1\":\" \",\"ind2\":\" \"}},{\"040\":{\"subfields\":[{\"c\":\"UPB\"},{\"d\":\"UPB\"},{\"d\":\"NIC\"},{\"d\":\"NIC\"}],\"ind1\":\" \",\"ind2\":\" \"}},{\"041\":{\"subfields\":[{\"a\":\"latitager\"},{\"g\":\"ger\"}],\"ind1\":\"0\",\"ind2\":\" \"}},{\"045\":{\"subfields\":[{\"a\":\"v6v9\"}],\"ind1\":\" \",\"ind2\":\" \"}},{\"047\":{\"subfields\":[{\"a\":\"cn\"},{\"a\":\"ct\"},{\"a\":\"co\"},{\"a\":\"df\"},{\"a\":\"dv\"},{\"a\":\"ft\"},{\"a\":\"fg\"},{\"a\":\"ms\"},{\"a\":\"mi\"},{\"a\":\"nc\"},{\"a\":\"op\"},{\"a\":\"ov\"},{\"a\":\"rq\"},{\"a\":\"sn\"},{\"a\":\"su\"},{\"a\":\"sy\"},{\"a\":\"vr\"},{\"a\":\"zz\"}],\"ind1\":\" \",\"ind2\":\" \"}},{\"050\":{\"subfields\":[{\"a\":\"M3\"},{\"b\":\".M896\"}],\"ind1\":\"0\",\"ind2\":\" \"}},{\"100\":{\"subfields\":[{\"a\":\"Mozart, Wolfgang Amadeus,\"},{\"d\":\"1756-1791.\"}],\"ind1\":\"1\",\"ind2\":\" \"}},{\"240\":{\"subfields\":[{\"a\":\"Works\"}],\"ind1\":\"1\",\"ind2\":\"0\"}},{\"245\":{\"subfields\":[{\"a\":\"Neue Ausgabe sa\\u0308mtlicher Werke,\"},{\"b\":\"in Verbindung mit den Mozartsta\\u0308dten, Augsburg, Salzburg und Wien.\"},{\"c\":\"Hrsg. von der Internationalen Stiftung Mozarteum, Salzburg.\"}],\"ind1\":\"1\",\"ind2\":\"0\"}},{\"246\":{\"subfields\":[{\"a\":\"Neue Mozart-Ausgabe\"}],\"ind1\":\"3\",\"ind2\":\"3\"}},{\"260\":{\"subfields\":[{\"a\":\"Kassel,\"},{\"b\":\"Ba\\u0308renreiter,\"},{\"c\":\"c1955-\"}],\"ind1\":\" \",\"ind2\":\" \"}},{\"300\":{\"subfields\":[{\"a\":\"v.\"},{\"b\":\"facsims.\"},{\"c\":\"33 cm.\"}],\"ind1\":\" \",\"ind2\":\" \"}},{\"505\":{\"subfields\":[{\"a\":\"Ser. I. Geistliche Gesangswerke -- Ser. II. Opern -- Ser. III. Lieder, mehrstimmige Gesa\\u0308nge, Kanons -- Ser. IV. Orchesterwerke -- Ser. V. Konzerte -- Ser. VI. Kirchensonaten -- Ser. VII. Ensemblemusik fu\\u0308r gro\\u0308ssere Solobesetzungen -- Ser. VIII. Kammermusik -- Ser. IX. Klaviermusik -- Ser. X. Supplement.\"}],\"ind1\":\"0\",\"ind2\":\" \"}},{\"650\":{\"subfields\":[{\"a\":\"Vocal music\"}],\"ind1\":\" \",\"ind2\":\"0\"}},{\"650\":{\"subfields\":[{\"a\":\"Instrumental music\"}],\"ind1\":\" \",\"ind2\":\"0\"}},{\"650\":{\"subfields\":[{\"a\":\"Instrumental music\"},{\"2\":\"fast\"},{\"0\":\"(OCoLC)fst00974414\"}],\"ind1\":\" \",\"ind2\":\"7\"}},{\"650\":{\"subfields\":[{\"a\":\"Vocal music\"},{\"2\":\"fast\"},{\"0\":\"(OCoLC)fst01168379\"}],\"ind1\":\" \",\"ind2\":\"7\"}},{\"902\":{\"subfields\":[{\"a\":\"pfnd\"},{\"b\":\"Austin Music\"}],\"ind1\":\" \",\"ind2\":\" \"}},{\"905\":{\"subfields\":[{\"a\":\"19980728120000.0\"}],\"ind1\":\" \",\"ind2\":\" \"}},{\"948\":{\"subfields\":[{\"a\":\"20100622\"},{\"b\":\"s\"},{\"d\":\"lap11\"},{\"e\":\"lts\"},{\"x\":\"ToAddCatStat\"}],\"ind1\":\"1\",\"ind2\":\" \"}},{\"948\":{\"subfields\":[{\"a\":\"20110818\"},{\"b\":\"r\"},{\"d\":\"np55\"},{\"e\":\"lts\"}],\"ind1\":\"0\",\"ind2\":\" \"}},{\"948\":{\"subfields\":[{\"a\":\"20130128\"},{\"b\":\"m\"},{\"d\":\"bmt1\"},{\"e\":\"lts\"}],\"ind1\":\"2\",\"ind2\":\" \"}},{\"948\":{\"subfields\":[{\"a\":\"20141106\"},{\"b\":\"m\"},{\"d\":\"batch\"},{\"e\":\"lts\"},{\"x\":\"addfast\"}],\"ind1\":\"2\",\"ind2\":\"\"}}]}\n" +{ + "leader": "01542ccm a2200361 4500", + "fields": [ + { + "001": "393893" + }, + { + "005": "20141107001016.0" + }, + { + "008": "830419m19559999gw mua hiz n lat " + }, + { + "010": { + "subfields": [ + { + "a": " 55001156/M " + } + ], + "ind1": "", + "ind2": " " + } + }, + { + "035": { + "subfields": [ + { + "a": "(OCoLC)63611770" + } + ], + "ind1": " ", + "ind2": " " + } + }, + { + "035": { + "subfields": [ + { + "a": "393893" + } + ], + "ind1": " ", + "ind2": " " + } + }, + { + "040": { + "subfields": [ + { + "c": "UPB" + }, + { + "d": "UPB" + }, + { + "d": "NIC" + }, + { + "d": "NIC" + } + ], + "ind1": " ", + "ind2": " " + } + }, + { + "041": { + "subfields": [ + { + "a": "latitager" + }, + { + "g": "ger" + } + ], + "ind1": "0", + "ind2": " " + } + }, + { + "045": { + "subfields": [ + { + "a": "v6v9" + } + ], + "ind1": " ", + "ind2": " " + } + }, + { + "047": { + "subfields": [ + { + "a": "cn" + }, + { + "a": "ct" + }, + { + "a": "co" + }, + { + "a": "df" + }, + { + "a": "dv" + }, + { + "a": "ft" + }, + { + "a": "fg" + }, + { + "a": "ms" + }, + { + "a": "mi" + }, + { + "a": "nc" + }, + { + "a": "op" + }, + { + "a": "ov" + }, + { + "a": "rq" + }, + { + "a": "sn" + }, + { + "a": "su" + }, + { + "a": "sy" + }, + { + "a": "vr" + }, + { + "a": "zz" + } + ], + "ind1": " ", + "ind2": " " + } + }, + { + "050": { + "subfields": [ + { + "a": "M3" + }, + { + "b": ".M896" + } + ], + "ind1": "0", + "ind2": " " + } + }, + { + "100": { + "subfields": [ + { + "a": "Mozart, Wolfgang Amadeus," + }, + { + "d": "1756-1791." + } + ], + "ind1": "1", + "ind2": " " + } + }, + { + "240": { + "subfields": [ + { + "a": "Works" + } + ], + "ind1": "1", + "ind2": "0" + } + }, + { + "245": { + "subfields": [ + { + "a": "Neue Ausgabe sa\u0308mtlicher Werke," + }, + { + "b": "in Verbindung mit den Mozartsta\u0308dten, Augsburg, Salzburg und Wien." + }, + { + "c": "Hrsg. von der Internationalen Stiftung Mozarteum, Salzburg." + } + ], + "ind1": "1", + "ind2": "0" + } + }, + { + "246": { + "subfields": [ + { + "a": "Neue Mozart-Ausgabe" + } + ], + "ind1": "3", + "ind2": "3" + } + }, + { + "260": { + "subfields": [ + { + "a": "Kassel," + }, + { + "b": "Ba\u0308renreiter," + }, + { + "c": "c1955-" + } + ], + "ind1": " ", + "ind2": " " + } + }, + { + "300": { + "subfields": [ + { + "a": "v." + }, + { + "b": "facsims." + }, + { + "c": "33 cm." + } + ], + "ind1": " ", + "ind2": " " + } + }, + { + "505": { + "subfields": [ + { + "a": "Ser. I. Geistliche Gesangswerke -- Ser. II. Opern -- Ser. III. Lieder, mehrstimmige Gesa\u0308nge, Kanons -- Ser. IV. Orchesterwerke -- Ser. V. Konzerte -- Ser. VI. Kirchensonaten -- Ser. VII. Ensemblemusik fu\u0308r gro\u0308ssere Solobesetzungen -- Ser. VIII. Kammermusik -- Ser. IX. Klaviermusik -- Ser. X. Supplement." + } + ], + "ind1": "0", + "ind2": " " + } + }, + { + "650": { + "subfields": [ + { + "a": "Vocal music" + } + ], + "ind1": " ", + "ind2": "0" + } + }, + { + "650": { + "subfields": [ + { + "a": "Instrumental music" + } + ], + "ind1": " ", + "ind2": "0" + } + }, + { + "650": { + "subfields": [ + { + "a": "Instrumental music" + }, + { + "2": "fast" + }, + { + "0": "(OCoLC)fst00974414" + } + ], + "ind1": " ", + "ind2": "7" + } + }, + { + "650": { + "subfields": [ + { + "a": "Vocal music" + }, + { + "2": "fast" + }, + { + "0": "(OCoLC)fst01168379" + } + ], + "ind1": " ", + "ind2": "7" + } + }, + { + "902": { + "subfields": [ + { + "a": "pfnd" + }, + { + "b": "Austin Music" + } + ], + "ind1": " ", + "ind2": " " + } + }, + { + "905": { + "subfields": [ + { + "a": "19980728120000.0" + } + ], + "ind1": " ", + "ind2": " " + } + }, + { + "948": { + "subfields": [ + { + "a": "20100622" + }, + { + "b": "s" + }, + { + "d": "lap11" + }, + { + "e": "lts" + }, + { + "x": "ToAddCatStat" + } + ], + "ind1": "1", + "ind2": " " + } + }, + { + "948": { + "subfields": [ + { + "a": "20110818" + }, + { + "b": "r" + }, + { + "d": "np55" + }, + { + "e": "lts" + } + ], + "ind1": "0", + "ind2": " " + } + }, + { + "948": { + "subfields": [ + { + "a": "20130128" + }, + { + "b": "m" + }, + { + "d": "bmt1" + }, + { + "e": "lts" + } + ], + "ind1": "2", + "ind2": " " + } + }, + { + "948": { + "subfields": [ + { + "a": "20141106" + }, + { + "b": "m" + }, + { + "d": "batch" + }, + { + "e": "lts" + }, + { + "x": "addfast" + } + ], + "ind1": "2", + "ind2": "" + } + } + ] +}