Fixed NullPointer when mapping nullable date values.

Author: CollinAlpert

README.md

@@ -20,7 +20,7 @@ Include the Maven artifact:
 <dependency>
     <groupId>com.github.collinalpert</groupId>
     <artifactId>java2db</artifactId>
-    <version>4.1</version>
+    <version>4.1.1</version>
 </dependency>
 ```
 Or include the [JAR](https://github.com/CollinAlpert/Java2DB/releases/latest) in your project. 
@@ -101,7 +101,7 @@ public class PersonService extends BaseService<Person> {
 Every service *must* extend `BaseService`.
 
 That's it! Now we can get data from the database using the services using simple methods like `getById` and so on.\
-As you can see from the example, custom methods can be defined in the respective service using the `getSingle` or `getMultiple` methods provided by the `BaseService`.\
+As you can see from the example, custom methods can be defined in the respective service using the `getSingle` or `getMultiple` methods provided by the `BaseService`.
 
 The last thing you need to do is give Java2DB access to your database. Set the static variables `HOST`, `DATABASE`, `USERNAME`, `PASSWORD` and optionally `PORT` of the `DBConnection` class to achieve possibility of connection.
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.collinalpert</groupId>
     <artifactId>java2db</artifactId>
-    <version>4.1</version>
+    <version>4.1.1</version>
     <packaging>jar</packaging>
 
     <name>Java2DB</name>

src/main/java/com/github/collinalpert/java2db/mappers/BaseMapper.java

@@ -181,16 +181,7 @@ private <E extends BaseEntity> void setFields(ResultSet set, E entity, String id
 			var columnName = Utilities.getColumnName(field);
 			var columnLabel = (identifier == null ? Utilities.getTableName(entity.getClass()) : identifier) + "_" + columnName;
 
-			Object value;
-			if (field.getType() == LocalDateTime.class) {
-				value = set.getTimestamp(columnLabel, Calendar.getInstance(Locale.getDefault())).toLocalDateTime();
-			} else if (field.getType() == LocalDate.class) {
-				value = set.getDate(columnLabel, Calendar.getInstance(Locale.getDefault())).toLocalDate();
-			} else if (field.getType() == LocalTime.class) {
-				value = set.getTime(columnLabel, Calendar.getInstance(Locale.getDefault())).toLocalTime();
-			} else {
-				value = set.getObject(columnLabel);
-			}
+			Object value = getValue(set, columnLabel, field.getType());
 
 			if (value == null) {
 				continue;
@@ -200,6 +191,21 @@ private <E extends BaseEntity> void setFields(ResultSet set, E entity, String id
 		}
 	}
 
+	private Object getValue(ResultSet set, String columnLabel, Class<?> type) throws SQLException {
+		if (type == LocalDateTime.class) {
+			var value = set.getTimestamp(columnLabel, Calendar.getInstance(Locale.getDefault()));
+			return value == null ? null : value.toLocalDateTime();
+		} else if (type == LocalDate.class) {
+			var value = set.getDate(columnLabel, Calendar.getInstance(Locale.getDefault()));
+			return value == null ? null : value.toLocalDate();
+		} else if (type == LocalTime.class) {
+			var value = set.getTime(columnLabel, Calendar.getInstance(Locale.getDefault()));
+			return value == null ? null : value.toLocalTime();
+		} else {
+			return set.getObject(columnLabel);
+		}
+	}
+
 	private String getForeignKeyName(Field field) {
 		var foreignKeyColumnName = field.getAnnotation(ForeignKeyEntity.class).value();
 

src/main/java/com/github/collinalpert/java2db/utilities/Utilities.java

@@ -203,7 +203,7 @@ public static <E extends Throwable> void tryAction(ThrowableRunnable<E> runnable
 	}
 
 	/**
-	 * Tries to perform a certain supplier and retrieve its value while considering a checked exception that could occur.
+	 * Tries to execute a supplier and retrieve its value while considering a checked exception that could occur.
 	 *
 	 * @param supplier The {@code Supplier} to try to execute.
 	 * @param <T>      The type of value to return.