refactor: replace deprecated FriendlyId with FriendlyIds in all tests

Author: mariuszs

friendly-id-jooq/src/test/java/com/devskiller/friendly_id/jooq/FriendlyIdConverterTest.java

@@ -6,6 +6,7 @@
 
 import com.devskiller.friendly_id.type.FriendlyId;
 
+import static com.devskiller.friendly_id.FriendlyIds.toFriendlyId;
 import static org.junit.jupiter.api.Assertions.*;
 
 class FriendlyIdConverterTest {
@@ -95,6 +96,6 @@ void shouldConvertToStringWhenNeeded() {
 		String friendlyIdString = friendlyId.toString();
 
 		// then
-		assertEquals(com.devskiller.friendly_id.FriendlyId.toFriendlyId(uuid), friendlyIdString);
+		assertEquals(toFriendlyId(uuid), friendlyIdString);
 	}
 }

friendly-id-jpa/src/test/java/com/devskiller/friendly_id/jpa/FriendlyIdConverterTest.java

@@ -6,6 +6,7 @@
 
 import com.devskiller.friendly_id.type.FriendlyId;
 
+import static com.devskiller.friendly_id.FriendlyIds.toFriendlyId;
 import static org.junit.jupiter.api.Assertions.*;
 
 class FriendlyIdConverterTest {
@@ -77,6 +78,6 @@ void shouldConvertToStringWhenNeeded() {
 		String friendlyIdString = friendlyId.toString();
 
 		// then
-		assertEquals(com.devskiller.friendly_id.FriendlyId.toFriendlyId(uuid), friendlyIdString);
+		assertEquals(toFriendlyId(uuid), friendlyIdString);
 	}
 }

friendly-id-openfeign/src/test/java/com/devskiller/friendly_id/openfeign/FriendlyIdEncoderTest.java

@@ -1,13 +1,15 @@
 package com.devskiller.friendly_id.openfeign;
 
-import java.lang.reflect.Type;
 import java.util.UUID;
 
 import org.junit.jupiter.api.Test;
 
+import com.devskiller.friendly_id.type.FriendlyId;
+
 import feign.RequestTemplate;
 import feign.codec.Encoder;
 
+import static com.devskiller.friendly_id.FriendlyIds.toFriendlyId;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class FriendlyIdEncoderTest {
@@ -16,8 +18,8 @@ class FriendlyIdEncoderTest {
 	void shouldEncodeUuidAsFriendlyId() {
 		// given
 		UUID uuid = UUID.fromString("c3587ec5-0976-497f-8374-61e0c2ea3da5");
-		String expectedFriendlyId = com.devskiller.friendly_id.FriendlyId.toFriendlyId(uuid);
-		
+		String expectedFriendlyId = toFriendlyId(uuid);
+
 		String[] capturedValue = new String[1];
 		Encoder delegateEncoder = (object, bodyType, template) -> {
 			capturedValue[0] = (String) object;
@@ -36,9 +38,9 @@ void shouldEncodeUuidAsFriendlyId() {
 	void shouldEncodeFriendlyIdValueObjectAsString() {
 		// given
 		UUID uuid = UUID.fromString("c3587ec5-0976-497f-8374-61e0c2ea3da5");
-		com.devskiller.friendly_id.type.FriendlyId friendlyId = com.devskiller.friendly_id.type.FriendlyId.of(uuid);
+		FriendlyId friendlyId = FriendlyId.of(uuid);
 		String expectedString = friendlyId.toString();
-		
+
 		String[] capturedValue = new String[1];
 		Encoder delegateEncoder = (object, bodyType, template) -> {
 			capturedValue[0] = (String) object;
@@ -47,7 +49,7 @@ void shouldEncodeFriendlyIdValueObjectAsString() {
 		RequestTemplate template = new RequestTemplate();
 
 		// when
-		encoder.encode(friendlyId, com.devskiller.friendly_id.type.FriendlyId.class, template);
+		encoder.encode(friendlyId, FriendlyId.class, template);
 
 		// then
 		assertThat(capturedValue[0]).isEqualTo(expectedString);