From 968ab4fd75d1faf3082c7786dda2eee1860cd01b Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 18 Sep 2023 14:25:45 +0200
Subject: [PATCH] OZG-4237 OZG-4316 rename method
---
.../java/de/ozgcloud/alfa/export/DokumentTypeCreator.java | 2 +-
.../de/ozgcloud/alfa/export/PrimaerdokumentTypeCreator.java | 2 +-
.../main/java/de/ozgcloud/alfa/export/UUIDConverter.java | 2 +-
.../de/ozgcloud/alfa/export/DokumentTypeCreatorTest.java | 4 ++--
.../alfa/export/PrimaerdokumentTypeCreatorTest.java | 4 ++--
.../java/de/ozgcloud/alfa/export/UUIDConverterTest.java | 6 +++---
6 files changed, 10 insertions(+), 10 deletions(-)
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 7f7ac932d9..240735b345 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 7d3cf1dfa0..eb2878a674 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 42c31b15f9..ad28c0ea96 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 022d66ea3e..743f719d02 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 25f55d5461..d2cea2a5a3 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 bc03ef5a1e..9d6e44fb53 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);
}
}
--
GitLab