changed mapping method to have one less parameter

Author: FragonGamer

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Launch Current File",
+            "request": "launch",
+            "mainClass": "${file}",
+            "vmArgs": "--add-opens=java.base/java.lang=ALL-UNNAMED"
+        }
+    ]
+}

src/main/java/info/unterrainer/commons/serialization/objectmapper/ObjectMapper.java

@@ -37,13 +37,15 @@ public <A, B> void registerMapping(@NonNull final Class<A> sourceType, @NonNull
 			mappings.put(new MappingKey<>(targetType, sourceType), back);
 	}
 
-	public <S, T> T map(@NonNull final Class<S> sourceType, @NonNull final Class<T> targetType,
+	public <S, T> T map(@NonNull final Class<T> targetType,
 			@NonNull final S source) {
-		return map(sourceType, targetType, source, null);
+		return map(targetType, source, null);
 	}
 
-	public <S, T> T map(@NonNull final Class<S> sourceType, @NonNull final Class<T> targetType, @NonNull final S source,
+	@SuppressWarnings("unchecked")
+	public <S, T> T map(@NonNull final Class<T> targetType, @NonNull final S source,
 			final T target) {
+		final Class<S> sourceType = (Class<S>) source.getClass();
 		T result = mapWithJMapper(sourceType, targetType, source, target);
 		return mapWithBiConsumer(sourceType, targetType, source, result);
 	}

src/test/java/info/unterrainer/commons/serialization/objectmapper/ObjectMapperMappingTests.java

@@ -2,7 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.time.LocalDate;
 import java.util.Arrays;
@@ -14,7 +13,6 @@
 import info.unterrainer.commons.serialization.objectmapper.models.ObjectWithArray;
 import info.unterrainer.commons.serialization.objectmapper.models.ObjectWithObject;
 import info.unterrainer.commons.serialization.objectmapper.models.OtherObjectWithArray;
-import info.unterrainer.commons.serialization.objectmapper.models.OtherObjectWithObject;
 import info.unterrainer.commons.serialization.objectmapper.models.OtherSimpleUser;
 import info.unterrainer.commons.serialization.objectmapper.models.SimpleUser;
 
@@ -71,7 +69,7 @@ public void mappingComplexUserToSimpleUserWorks() {
 		cu.setDateTime(LocalDate.now());
 		cu.setValue(100.00d);
 		SimpleUser su = SimpleUser.builder().build();
-		su = oMapper.map(ComplexUser.class, SimpleUser.class, cu, su);
+		su = oMapper.map(cu, su);
 		assertEquals(su.getFirstName(), cu.getFirstName());
 		assertEquals(su.getLastName(), cu.getLastName());
 	}
@@ -84,7 +82,7 @@ public void mappingComplexUserToOtherSimpleUserWorks() {
 		cu.setDateTime(LocalDate.now());
 		cu.setValue(100.00d);
 		OtherSimpleUser osu = OtherSimpleUser.builder().build();
-		osu = oMapper.map(ComplexUser.class, OtherSimpleUser.class, cu, osu);
+		osu = oMapper.map(cu, osu);
 		assertEquals(osu.getFirstName(), cu.getFirstName());
 		assertEquals(osu.getSurName(), cu.getLastName());
 	}
@@ -95,7 +93,7 @@ public void mappingOtherSimpleUserToComplexUserWorks() {
 		su.setFirstName("Danijel");
 		su.setSurName("Balog");
 		ComplexUser cu = ComplexUser.builder().build();
-		cu = oMapper.map(OtherSimpleUser.class, ComplexUser.class, su, cu);
+		cu = oMapper.map(su, cu);
 		assertEquals(su.getFirstName(), cu.getFirstName());
 		assertEquals(su.getSurName(), cu.getLastName());
 	}
@@ -107,7 +105,7 @@ public void mappingObjectWithArrayWorks() {
 				"Balog",
 				"Hallo"
 		};
-		ObjectWithArray oArray = oMapper.map(String[].class, ObjectWithArray.class, array);
+		ObjectWithArray oArray = oMapper.map(ObjectWithArray.class, array);
 		assertArrayEquals(array, oArray.getObjects());
 	}
 
@@ -119,14 +117,14 @@ public void mappingObjectWithArrayOfObjectsWorks() {
 				"Balog",
 				"Hallo"
 		});
-		OtherObjectWithArray oArray = oMapper.map(ObjectWithArray.class, OtherObjectWithArray.class, array);
+		OtherObjectWithArray oArray = oMapper.map(OtherObjectWithArray.class, array);
 		assertArrayEquals(array.getObjects(), oArray.getObjects());
 	}
 
 	@Test
 	public void mappingObjectWithinObjectWorks() {
 		Integer i = 1234;
-		ObjectWithObject oWO = oMapper.map(Integer.class, ObjectWithObject.class, i);
+		ObjectWithObject oWO = oMapper.map(ObjectWithObject.class, i);
 		assertEquals(i, oWO.getObject());
 	}
 }

src/test/java/info/unterrainer/commons/serialization/objectmapper/ObjectMapperSimpleTests.java

@@ -25,37 +25,37 @@ public void beforeEach() {
 	@Test
 	public void mappingCarToCarDtoWorks() {
 		Car car = new Car(2, "1929");
-		CarDto carDto = oMapper.map(Car.class, CarDto.class, car);
+		CarDto carDto = oMapper.map(CarDto.class, car);
 		assertEquals(car.getDoorCount(), carDto.getDoorCount());
 		assertEquals(car.getMakeOfYear(), carDto.getMakeOfYear());
 	}
 
 	@Test
 	public void mappingCarToSmallCarDtoWorks() {
 		Car car = new Car(2, "1929");
-		SmallCarDto smallCarDto = oMapper.map(Car.class, SmallCarDto.class, car);
+		SmallCarDto smallCarDto = oMapper.map(SmallCarDto.class, car);
 		assertEquals(car.getDoorCount(), smallCarDto.getDoorCount());
 	}
 
 	@Test
 	public void mappingSmallCarDtoToCarWorks() {
 		SmallCarDto smallCarDto = new SmallCarDto(2);
-		Car car = oMapper.map(SmallCarDto.class, Car.class, smallCarDto);
+		Car car = oMapper.map(Car.class, smallCarDto);
 		assertEquals(smallCarDto.getDoorCount(), car.getDoorCount());
 	}
 
 	@Test
 	public void mappingCarDtoToSimpleUserThrowsException() {
 		assertThrows(ObjectMapperMappingException.class, () -> {
 			CarDto car = new CarDto(4, "1975");
-			oMapper.map(CarDto.class, SimpleUser.class, car);
+			oMapper.map(SimpleUser.class, car);
 		});
 	}
 
 	@Test
 	public void mappingObjectToObjectWorks() {
 		ObjectWithObject oWO = new ObjectWithObject("HALLO");
-		OtherObjectWithObject otherOWO = oMapper.map(ObjectWithObject.class, OtherObjectWithObject.class, oWO);
+		OtherObjectWithObject otherOWO = oMapper.map(OtherObjectWithObject.class, oWO);
 		assertEquals(oWO.getObject(), otherOWO.getObject());
 	}
 }