diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/DokumentTypeCreator.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/DokumentTypeCreator.java index 7f7ac932d95d3e464cdab7cb18fceba4090ca2f9..240735b34501fe979d02f97e8b45a7f848faf3db 100644 --- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/DokumentTypeCreator.java +++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/DokumentTypeCreator.java @@ -48,7 +48,7 @@ class DokumentTypeCreator { IdentifikationObjektType createIdentifikation(int dokumentOrdinalNumber, String fileId) { var identifikation = new IdentifikationObjektType(); - identifikation.setID(uuidConverter.convertObjectIdToUUID(fileId)); + identifikation.setID(uuidConverter.fromObjectId(fileId)); identifikation.setNummerImUebergeordnetenContainer(Long.valueOf(dokumentOrdinalNumber)); return identifikation; } diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/PrimaerdokumentTypeCreator.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/PrimaerdokumentTypeCreator.java index 7d3cf1dfa01c5512244328f0c2ea4750ca3db607..eb2878a6743cb451eae8412552e5ca2be7725f30 100644 --- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/PrimaerdokumentTypeCreator.java +++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/PrimaerdokumentTypeCreator.java @@ -22,6 +22,6 @@ class PrimaerdokumentTypeCreator { } String createDateiname(OzgFile ozgFile) { - return String.format("%s_%s", uuidConverter.convertObjectIdToUUID(ozgFile.getId().toString()), ozgFile.getName()); + return String.format("%s_%s", uuidConverter.fromObjectId(ozgFile.getId().toString()), ozgFile.getName()); } } diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/UUIDConverter.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/UUIDConverter.java index 42c31b15f9f33c675a2f2f7618865637d431c653..ad28c0ea96923a9567330fed9fa1bea30cc3f15c 100644 --- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/UUIDConverter.java +++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/UUIDConverter.java @@ -11,7 +11,7 @@ class UUIDConverter { private static final Pattern UUID_SPLIT_PATTERN = Pattern.compile( "^([a-fA-F0-9]{8})([a-fA-F0-9]{4})([a-fA-F0-9]{4})([a-fA-F0-9]{4})([a-fA-F0-9]+)$"); - public String convertObjectIdToUUID(String objectId) { + public String fromObjectId(String objectId) { var matcher = UUID_SPLIT_PATTERN.matcher(objectId); if (matcher.find()) { var lastGroup = StringUtils.leftPad(matcher.group(5), 12, "0"); diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/DokumentTypeCreatorTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/DokumentTypeCreatorTest.java index 022d66ea3e7589e1bb897aeea7015a2d078eef5a..743f719d02220b470dc129ad4151a68f4c8a8b17 100644 --- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/DokumentTypeCreatorTest.java +++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/DokumentTypeCreatorTest.java @@ -140,14 +140,14 @@ class DokumentTypeCreatorTest { @BeforeEach void init() { - when(uuidConverter.convertObjectIdToUUID(FILE_ID)).thenReturn(FILE_UUID); + when(uuidConverter.fromObjectId(FILE_ID)).thenReturn(FILE_UUID); } @Test void shouldConvertObjectId() { create(); - verify(uuidConverter).convertObjectIdToUUID(FILE_ID); + verify(uuidConverter).fromObjectId(FILE_ID); } @Test diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/PrimaerdokumentTypeCreatorTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/PrimaerdokumentTypeCreatorTest.java index 25f55d54617a9f9828efadc448ee34fe8154e9ab..d2cea2a5a3374289b5f4c2d5b3a5a1bd31d907cc 100644 --- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/PrimaerdokumentTypeCreatorTest.java +++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/PrimaerdokumentTypeCreatorTest.java @@ -73,14 +73,14 @@ class PrimaerdokumentTypeCreatorTest { @BeforeEach void init() { - when(uuidConverter.convertObjectIdToUUID(ozgFile.getId().toString())).thenReturn("64a820d3-6285-172a-c028-0000000026d0"); + when(uuidConverter.fromObjectId(ozgFile.getId().toString())).thenReturn("64a820d3-6285-172a-c028-0000000026d0"); } @Test void shouldConvertObjectId() { creator.createDateiname(ozgFile); - verify(uuidConverter).convertObjectIdToUUID(ozgFile.getId().toString()); + verify(uuidConverter).fromObjectId(ozgFile.getId().toString()); } @Test diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/UUIDConverterTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/UUIDConverterTest.java index bc03ef5a1ef3ed4c9f98d07db400ce9dbba0ce78..9d6e44fb53c75d36b71fcfd4e8e66ea90f07f188 100644 --- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/UUIDConverterTest.java +++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/UUIDConverterTest.java @@ -14,18 +14,18 @@ class UUIDConverterTest { private UUIDConverter converter; @Nested - class TestConvertObjectIdToUUID { + class TestFromObjectId { @Test void shouldReturnUUID() { - var result = converter.convertObjectIdToUUID("64a820d36285172ac02826d0"); + var result = converter.fromObjectId("64a820d36285172ac02826d0"); assertThat(result).isEqualTo("64a820d3-6285-172a-c028-0000000026d0").matches(TestUtils.UUID_REGEX); } @Test void shouldThrowIllegalArgumentException() { - assertThatThrownBy(() -> converter.convertObjectIdToUUID("abc")).isInstanceOf(IllegalArgumentException.class); + assertThatThrownBy(() -> converter.fromObjectId("abc")).isInstanceOf(IllegalArgumentException.class); } }