Skip to content
Snippets Groups Projects
Commit 968ab4fd authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4237 OZG-4316 rename method

parent b2215fbb
No related branches found
No related tags found
No related merge requests found
...@@ -48,7 +48,7 @@ class DokumentTypeCreator { ...@@ -48,7 +48,7 @@ class DokumentTypeCreator {
IdentifikationObjektType createIdentifikation(int dokumentOrdinalNumber, String fileId) { IdentifikationObjektType createIdentifikation(int dokumentOrdinalNumber, String fileId) {
var identifikation = new IdentifikationObjektType(); var identifikation = new IdentifikationObjektType();
identifikation.setID(uuidConverter.convertObjectIdToUUID(fileId)); identifikation.setID(uuidConverter.fromObjectId(fileId));
identifikation.setNummerImUebergeordnetenContainer(Long.valueOf(dokumentOrdinalNumber)); identifikation.setNummerImUebergeordnetenContainer(Long.valueOf(dokumentOrdinalNumber));
return identifikation; return identifikation;
} }
......
...@@ -22,6 +22,6 @@ class PrimaerdokumentTypeCreator { ...@@ -22,6 +22,6 @@ class PrimaerdokumentTypeCreator {
} }
String createDateiname(OzgFile ozgFile) { 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());
} }
} }
...@@ -11,7 +11,7 @@ class UUIDConverter { ...@@ -11,7 +11,7 @@ class UUIDConverter {
private static final Pattern UUID_SPLIT_PATTERN = Pattern.compile( 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]+)$"); "^([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); var matcher = UUID_SPLIT_PATTERN.matcher(objectId);
if (matcher.find()) { if (matcher.find()) {
var lastGroup = StringUtils.leftPad(matcher.group(5), 12, "0"); var lastGroup = StringUtils.leftPad(matcher.group(5), 12, "0");
......
...@@ -140,14 +140,14 @@ class DokumentTypeCreatorTest { ...@@ -140,14 +140,14 @@ class DokumentTypeCreatorTest {
@BeforeEach @BeforeEach
void init() { void init() {
when(uuidConverter.convertObjectIdToUUID(FILE_ID)).thenReturn(FILE_UUID); when(uuidConverter.fromObjectId(FILE_ID)).thenReturn(FILE_UUID);
} }
@Test @Test
void shouldConvertObjectId() { void shouldConvertObjectId() {
create(); create();
verify(uuidConverter).convertObjectIdToUUID(FILE_ID); verify(uuidConverter).fromObjectId(FILE_ID);
} }
@Test @Test
......
...@@ -73,14 +73,14 @@ class PrimaerdokumentTypeCreatorTest { ...@@ -73,14 +73,14 @@ class PrimaerdokumentTypeCreatorTest {
@BeforeEach @BeforeEach
void init() { 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 @Test
void shouldConvertObjectId() { void shouldConvertObjectId() {
creator.createDateiname(ozgFile); creator.createDateiname(ozgFile);
verify(uuidConverter).convertObjectIdToUUID(ozgFile.getId().toString()); verify(uuidConverter).fromObjectId(ozgFile.getId().toString());
} }
@Test @Test
......
...@@ -14,18 +14,18 @@ class UUIDConverterTest { ...@@ -14,18 +14,18 @@ class UUIDConverterTest {
private UUIDConverter converter; private UUIDConverter converter;
@Nested @Nested
class TestConvertObjectIdToUUID { class TestFromObjectId {
@Test @Test
void shouldReturnUUID() { void shouldReturnUUID() {
var result = converter.convertObjectIdToUUID("64a820d36285172ac02826d0"); var result = converter.fromObjectId("64a820d36285172ac02826d0");
assertThat(result).isEqualTo("64a820d3-6285-172a-c028-0000000026d0").matches(TestUtils.UUID_REGEX); assertThat(result).isEqualTo("64a820d3-6285-172a-c028-0000000026d0").matches(TestUtils.UUID_REGEX);
} }
@Test @Test
void shouldThrowIllegalArgumentException() { void shouldThrowIllegalArgumentException() {
assertThatThrownBy(() -> converter.convertObjectIdToUUID("abc")).isInstanceOf(IllegalArgumentException.class); assertThatThrownBy(() -> converter.fromObjectId("abc")).isInstanceOf(IllegalArgumentException.class);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment