projects
/
jpa-converters
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7a33791
)
Prevented possible NullPointerException's
author
Kai Moritz
<kai@juplo.de>
Tue, 15 Aug 2017 17:56:06 +0000
(19:56 +0200)
committer
Kai Moritz
<kai@juplo.de>
Tue, 15 Aug 2017 17:56:06 +0000
(19:56 +0200)
24 files changed:
src/main/java/de/juplo/jpa/converters/DurationConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/InstantConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/LocalDateConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/LocalDateTimeConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/LocalTimeConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/LocaleConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/MonthDayConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/OffsetTimeConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/PeriodConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/TemporalAmountToDaysConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/TemporalAmountToHoursConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/TemporalAmountToMicrosConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/TemporalAmountToMillisConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/TemporalAmountToMinutesConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/TemporalAmountToNanosConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/TemporalAmountToSecondsConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/URIConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/URLConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/YearConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/YearMonthConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/ZoneIdConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/ZoneOffsetConverter.java
patch
|
blob
|
history
src/main/java/de/juplo/jpa/converters/ZonedDateTimeConverter.java
patch
|
blob
|
history
diff --git
a/src/main/java/de/juplo/jpa/converters/DurationConverter.java
b/src/main/java/de/juplo/jpa/converters/DurationConverter.java
index
402dcf3
..
0304ad4
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/DurationConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/DurationConverter.java
@@
-15,12
+15,16
@@
public class DurationConverter implements AttributeConverter<Duration, String>
@Override
public String convertToDatabaseColumn(Duration duration)
{
@Override
public String convertToDatabaseColumn(Duration duration)
{
+ if (duration == null)
+ return null;
return duration.toString();
}
@Override
public Duration convertToEntityAttribute(String string)
{
return duration.toString();
}
@Override
public Duration convertToEntityAttribute(String string)
{
+ if (string == null)
+ return null;
return Duration.parse(string);
}
}
return Duration.parse(string);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/InstantConverter.java
b/src/main/java/de/juplo/jpa/converters/InstantConverter.java
index
28cf149
..
b9c54ec
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/InstantConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/InstantConverter.java
@@
-16,12
+16,16
@@
public class InstantConverter implements AttributeConverter<Instant, Timestamp>
@Override
public Timestamp convertToDatabaseColumn(Instant instant)
{
@Override
public Timestamp convertToDatabaseColumn(Instant instant)
{
+ if (instant == null)
+ return null;
return Timestamp.from(instant);
}
@Override
public Instant convertToEntityAttribute(Timestamp ts)
{
return Timestamp.from(instant);
}
@Override
public Instant convertToEntityAttribute(Timestamp ts)
{
+ if (ts == null)
+ return null;
return ts.toInstant();
}
}
return ts.toInstant();
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/LocalDateConverter.java
b/src/main/java/de/juplo/jpa/converters/LocalDateConverter.java
index
2606602
..
7db0626
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/LocalDateConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/LocalDateConverter.java
@@
-16,12
+16,16
@@
public class LocalDateConverter implements AttributeConverter<LocalDate, Date>
@Override
public Date convertToDatabaseColumn(LocalDate ld)
{
@Override
public Date convertToDatabaseColumn(LocalDate ld)
{
+ if (ld == null)
+ return null;
return Date.valueOf(ld);
}
@Override
public LocalDate convertToEntityAttribute(Date date)
{
return Date.valueOf(ld);
}
@Override
public LocalDate convertToEntityAttribute(Date date)
{
+ if (date == null)
+ return null;
return date.toLocalDate();
}
}
return date.toLocalDate();
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/LocalDateTimeConverter.java
b/src/main/java/de/juplo/jpa/converters/LocalDateTimeConverter.java
index
24bf45b
..
b4773a4
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/LocalDateTimeConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/LocalDateTimeConverter.java
@@
-16,12
+16,16
@@
public class LocalDateTimeConverter implements AttributeConverter<LocalDateTime,
@Override
public Timestamp convertToDatabaseColumn(LocalDateTime ldt)
{
@Override
public Timestamp convertToDatabaseColumn(LocalDateTime ldt)
{
+ if (ldt == null)
+ return null;
return Timestamp.valueOf(ldt);
}
@Override
public LocalDateTime convertToEntityAttribute(Timestamp ts)
{
return Timestamp.valueOf(ldt);
}
@Override
public LocalDateTime convertToEntityAttribute(Timestamp ts)
{
+ if (ts == null)
+ return null;
return ts.toLocalDateTime();
}
}
return ts.toLocalDateTime();
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/LocalTimeConverter.java
b/src/main/java/de/juplo/jpa/converters/LocalTimeConverter.java
index
dc7ff99
..
70506c5
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/LocalTimeConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/LocalTimeConverter.java
@@
-16,12
+16,16
@@
public class LocalTimeConverter implements AttributeConverter<LocalTime, Time>
@Override
public Time convertToDatabaseColumn(LocalTime lt)
{
@Override
public Time convertToDatabaseColumn(LocalTime lt)
{
+ if (lt == null)
+ return null;
return Time.valueOf(lt);
}
@Override
public LocalTime convertToEntityAttribute(Time time)
{
return Time.valueOf(lt);
}
@Override
public LocalTime convertToEntityAttribute(Time time)
{
+ if (time == null)
+ return null;
return time.toLocalTime();
}
}
return time.toLocalTime();
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/LocaleConverter.java
b/src/main/java/de/juplo/jpa/converters/LocaleConverter.java
index
da84d15
..
0174e99
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/LocaleConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/LocaleConverter.java
@@
-16,12
+16,16
@@
public class LocaleConverter implements AttributeConverter<Locale, String>
@Override
public String convertToDatabaseColumn(Locale locale)
{
@Override
public String convertToDatabaseColumn(Locale locale)
{
+ if (locale == null)
+ return null;
return locale.toLanguageTag();
}
@Override
public Locale convertToEntityAttribute(String string)
{
return locale.toLanguageTag();
}
@Override
public Locale convertToEntityAttribute(String string)
{
+ if (string == null)
+ return null;
return Locale.forLanguageTag(string);
}
}
return Locale.forLanguageTag(string);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/MonthDayConverter.java
b/src/main/java/de/juplo/jpa/converters/MonthDayConverter.java
index
143ced1
..
9063c33
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/MonthDayConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/MonthDayConverter.java
@@
-15,12
+15,16
@@
public class MonthDayConverter implements AttributeConverter<MonthDay, String>
@Override
public String convertToDatabaseColumn(MonthDay monthday)
{
@Override
public String convertToDatabaseColumn(MonthDay monthday)
{
+ if (monthday == null)
+ return null;
return monthday.toString();
}
@Override
public MonthDay convertToEntityAttribute(String string)
{
return monthday.toString();
}
@Override
public MonthDay convertToEntityAttribute(String string)
{
+ if (string == null)
+ return null;
return MonthDay.parse(string);
}
}
return MonthDay.parse(string);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
b/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
index
8815cf0
..
3228aca
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
@@
-17,12
+17,16
@@
public class OffsetDateTimeConverter implements AttributeConverter<OffsetDateTim
@Override
public Timestamp convertToDatabaseColumn(OffsetDateTime odt)
{
@Override
public Timestamp convertToDatabaseColumn(OffsetDateTime odt)
{
+ if (odt == null)
+ return null;
return Timestamp.from(odt.withOffsetSameInstant(ZoneOffset.UTC).toInstant());
}
@Override
public OffsetDateTime convertToEntityAttribute(Timestamp ts)
{
return Timestamp.from(odt.withOffsetSameInstant(ZoneOffset.UTC).toInstant());
}
@Override
public OffsetDateTime convertToEntityAttribute(Timestamp ts)
{
+ if (ts == null)
+ return null;
return OffsetDateTime.of(ts.toLocalDateTime(), ZoneOffset.UTC);
}
}
return OffsetDateTime.of(ts.toLocalDateTime(), ZoneOffset.UTC);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/OffsetTimeConverter.java
b/src/main/java/de/juplo/jpa/converters/OffsetTimeConverter.java
index
92de0a9
..
6259860
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/OffsetTimeConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/OffsetTimeConverter.java
@@
-17,6
+17,8
@@
public class OffsetTimeConverter implements AttributeConverter<OffsetTime, Time>
@Override
public Time convertToDatabaseColumn(OffsetTime ot)
{
@Override
public Time convertToDatabaseColumn(OffsetTime ot)
{
+ if (ot == null)
+ return null;
ZoneOffset offset = ot.getOffset();
return Time.valueOf(ot.withOffsetSameInstant(ZoneOffset.UTC).toLocalTime());
}
ZoneOffset offset = ot.getOffset();
return Time.valueOf(ot.withOffsetSameInstant(ZoneOffset.UTC).toLocalTime());
}
@@
-24,6
+26,8
@@
public class OffsetTimeConverter implements AttributeConverter<OffsetTime, Time>
@Override
public OffsetTime convertToEntityAttribute(Time time)
{
@Override
public OffsetTime convertToEntityAttribute(Time time)
{
+ if (time == null)
+ return null;
return OffsetTime.of(time.toLocalTime(), ZoneOffset.UTC);
}
}
return OffsetTime.of(time.toLocalTime(), ZoneOffset.UTC);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/PeriodConverter.java
b/src/main/java/de/juplo/jpa/converters/PeriodConverter.java
index
b241a56
..
a760b64
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/PeriodConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/PeriodConverter.java
@@
-15,12
+15,16
@@
public class PeriodConverter implements AttributeConverter<Period, String>
@Override
public String convertToDatabaseColumn(Period period)
{
@Override
public String convertToDatabaseColumn(Period period)
{
+ if (period == null)
+ return null;
return period.toString();
}
@Override
public Period convertToEntityAttribute(String string)
{
return period.toString();
}
@Override
public Period convertToEntityAttribute(String string)
{
+ if (string == null)
+ return null;
return Period.parse(string);
}
}
return Period.parse(string);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/TemporalAmountToDaysConverter.java
b/src/main/java/de/juplo/jpa/converters/TemporalAmountToDaysConverter.java
index
f4ca829
..
fe4635c
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/TemporalAmountToDaysConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/TemporalAmountToDaysConverter.java
@@
-17,12
+17,16
@@
public class TemporalAmountToDaysConverter implements AttributeConverter<Tempora
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
+ if (amount == null)
+ return null;
return amount.get(ChronoUnit.DAYS);
}
@Override
public TemporalAmount convertToEntityAttribute(Long days)
{
return amount.get(ChronoUnit.DAYS);
}
@Override
public TemporalAmount convertToEntityAttribute(Long days)
{
+ if (days == null)
+ return null;
return Duration.ofDays(days);
}
}
return Duration.ofDays(days);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/TemporalAmountToHoursConverter.java
b/src/main/java/de/juplo/jpa/converters/TemporalAmountToHoursConverter.java
index
dc4cf1f
..
22e78cd
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/TemporalAmountToHoursConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/TemporalAmountToHoursConverter.java
@@
-17,12
+17,16
@@
public class TemporalAmountToHoursConverter implements AttributeConverter<Tempor
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
+ if (amount == null)
+ return null;
return amount.get(ChronoUnit.HOURS);
}
@Override
public TemporalAmount convertToEntityAttribute(Long hours)
{
return amount.get(ChronoUnit.HOURS);
}
@Override
public TemporalAmount convertToEntityAttribute(Long hours)
{
+ if (hours == null)
+ return null;
return Duration.ofHours(hours);
}
}
return Duration.ofHours(hours);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/TemporalAmountToMicrosConverter.java
b/src/main/java/de/juplo/jpa/converters/TemporalAmountToMicrosConverter.java
index
328b76d
..
75a2d3f
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/TemporalAmountToMicrosConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/TemporalAmountToMicrosConverter.java
@@
-18,12
+18,16
@@
public class TemporalAmountToMicrosConverter implements AttributeConverter<Tempo
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
+ if (amount == null)
+ return null;
return amount.get(ChronoUnit.MICROS);
}
@Override
public TemporalAmount convertToEntityAttribute(Long micros)
{
return amount.get(ChronoUnit.MICROS);
}
@Override
public TemporalAmount convertToEntityAttribute(Long micros)
{
+ if (micros == null)
+ return null;
return Duration.of(micros, ChronoUnit.MICROS);
}
}
return Duration.of(micros, ChronoUnit.MICROS);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/TemporalAmountToMillisConverter.java
b/src/main/java/de/juplo/jpa/converters/TemporalAmountToMillisConverter.java
index
dc3b799
..
e3bb8ce
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/TemporalAmountToMillisConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/TemporalAmountToMillisConverter.java
@@
-18,12
+18,16
@@
public class TemporalAmountToMillisConverter implements AttributeConverter<Tempo
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
+ if (amount == null)
+ return null;
return amount.get(ChronoUnit.MILLIS);
}
@Override
public TemporalAmount convertToEntityAttribute(Long millis)
{
return amount.get(ChronoUnit.MILLIS);
}
@Override
public TemporalAmount convertToEntityAttribute(Long millis)
{
+ if (millis == null)
+ return null;
return Duration.ofMillis(millis);
}
}
return Duration.ofMillis(millis);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/TemporalAmountToMinutesConverter.java
b/src/main/java/de/juplo/jpa/converters/TemporalAmountToMinutesConverter.java
index
87907be
..
c09f8ee
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/TemporalAmountToMinutesConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/TemporalAmountToMinutesConverter.java
@@
-17,12
+17,16
@@
public class TemporalAmountToMinutesConverter implements AttributeConverter<Temp
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
+ if (amount == null)
+ return null;
return amount.get(ChronoUnit.MINUTES);
}
@Override
public TemporalAmount convertToEntityAttribute(Long minutes)
{
return amount.get(ChronoUnit.MINUTES);
}
@Override
public TemporalAmount convertToEntityAttribute(Long minutes)
{
+ if (minutes == null)
+ return null;
return Duration.ofMinutes(minutes);
}
}
return Duration.ofMinutes(minutes);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/TemporalAmountToNanosConverter.java
b/src/main/java/de/juplo/jpa/converters/TemporalAmountToNanosConverter.java
index
d38a1db
..
99ad25a
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/TemporalAmountToNanosConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/TemporalAmountToNanosConverter.java
@@
-18,12
+18,16
@@
public class TemporalAmountToNanosConverter implements AttributeConverter<Tempor
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
+ if (amount == null)
+ return null;
return amount.get(ChronoUnit.NANOS);
}
@Override
public TemporalAmount convertToEntityAttribute(Long nanos)
{
return amount.get(ChronoUnit.NANOS);
}
@Override
public TemporalAmount convertToEntityAttribute(Long nanos)
{
+ if (nanos == null)
+ return null;
return Duration.ofNanos(nanos);
}
}
return Duration.ofNanos(nanos);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/TemporalAmountToSecondsConverter.java
b/src/main/java/de/juplo/jpa/converters/TemporalAmountToSecondsConverter.java
index
bd9fc13
..
4f4e6fc
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/TemporalAmountToSecondsConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/TemporalAmountToSecondsConverter.java
@@
-17,12
+17,16
@@
public class TemporalAmountToSecondsConverter implements AttributeConverter<Temp
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
@Override
public Long convertToDatabaseColumn(TemporalAmount amount)
{
+ if (amount == null)
+ return null;
return amount.get(ChronoUnit.SECONDS);
}
@Override
public TemporalAmount convertToEntityAttribute(Long seconds)
{
return amount.get(ChronoUnit.SECONDS);
}
@Override
public TemporalAmount convertToEntityAttribute(Long seconds)
{
+ if (seconds == null)
+ return null;
return Duration.ofSeconds(seconds);
}
}
return Duration.ofSeconds(seconds);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/URIConverter.java
b/src/main/java/de/juplo/jpa/converters/URIConverter.java
index
2ce54a6
..
5a1ac92
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/URIConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/URIConverter.java
@@
-15,12
+15,16
@@
public class URIConverter implements AttributeConverter<URI, String>
@Override
public String convertToDatabaseColumn(URI uri)
{
@Override
public String convertToDatabaseColumn(URI uri)
{
+ if (uri == null)
+ return null;
return uri.toASCIIString();
}
@Override
public URI convertToEntityAttribute(String string)
{
return uri.toASCIIString();
}
@Override
public URI convertToEntityAttribute(String string)
{
+ if (string == null)
+ return null;
return URI.create(string);
}
}
return URI.create(string);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/URLConverter.java
b/src/main/java/de/juplo/jpa/converters/URLConverter.java
index
9fe0c0e
..
b2fe2b1
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/URLConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/URLConverter.java
@@
-27,6
+27,8
@@
public class URLConverter implements AttributeConverter<URL, String>
@Override
public String convertToDatabaseColumn(URL url)
{
@Override
public String convertToDatabaseColumn(URL url)
{
+ if (url == null)
+ return null;
try
{
return url.toURI().toASCIIString();
try
{
return url.toURI().toASCIIString();
@@
-41,6
+43,8
@@
public class URLConverter implements AttributeConverter<URL, String>
@Override
public URL convertToEntityAttribute(String string)
{
@Override
public URL convertToEntityAttribute(String string)
{
+ if (string == null)
+ return null;
try
{
return URI.create(string).toURL();
try
{
return URI.create(string).toURL();
diff --git
a/src/main/java/de/juplo/jpa/converters/YearConverter.java
b/src/main/java/de/juplo/jpa/converters/YearConverter.java
index
59875a6
..
6e22267
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/YearConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/YearConverter.java
@@
-15,12
+15,16
@@
public class YearConverter implements AttributeConverter<Year, Integer>
@Override
public Integer convertToDatabaseColumn(Year year)
{
@Override
public Integer convertToDatabaseColumn(Year year)
{
+ if (year == null)
+ return null;
return year.getValue();
}
@Override
public Year convertToEntityAttribute(Integer integer)
{
return year.getValue();
}
@Override
public Year convertToEntityAttribute(Integer integer)
{
+ if (integer == null)
+ return null;
return Year.of(integer);
}
}
return Year.of(integer);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/YearMonthConverter.java
b/src/main/java/de/juplo/jpa/converters/YearMonthConverter.java
index
47718d9
..
f84b676
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/YearMonthConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/YearMonthConverter.java
@@
-15,12
+15,16
@@
public class YearMonthConverter implements AttributeConverter<YearMonth, String>
@Override
public String convertToDatabaseColumn(YearMonth yearmonth)
{
@Override
public String convertToDatabaseColumn(YearMonth yearmonth)
{
+ if (yearmonth == null)
+ return null;
return yearmonth.toString();
}
@Override
public YearMonth convertToEntityAttribute(String string)
{
return yearmonth.toString();
}
@Override
public YearMonth convertToEntityAttribute(String string)
{
+ if (string == null)
+ return null;
return YearMonth.parse(string);
}
}
return YearMonth.parse(string);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/ZoneIdConverter.java
b/src/main/java/de/juplo/jpa/converters/ZoneIdConverter.java
index
57f3ba1
..
6266ad0
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/ZoneIdConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/ZoneIdConverter.java
@@
-15,12
+15,16
@@
public class ZoneIdConverter implements AttributeConverter<ZoneId,String>
@Override
public String convertToDatabaseColumn(ZoneId zone)
{
@Override
public String convertToDatabaseColumn(ZoneId zone)
{
+ if (zone == null)
+ return null;
return zone.getId();
}
@Override
public ZoneId convertToEntityAttribute(String string)
{
return zone.getId();
}
@Override
public ZoneId convertToEntityAttribute(String string)
{
+ if (string == null)
+ return null;
return ZoneId.of(string);
}
}
return ZoneId.of(string);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/ZoneOffsetConverter.java
b/src/main/java/de/juplo/jpa/converters/ZoneOffsetConverter.java
index
f948b54
..
eca057f
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/ZoneOffsetConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/ZoneOffsetConverter.java
@@
-15,12
+15,16
@@
public class ZoneOffsetConverter implements AttributeConverter<ZoneOffset, Strin
@Override
public String convertToDatabaseColumn(ZoneOffset offset)
{
@Override
public String convertToDatabaseColumn(ZoneOffset offset)
{
+ if (offset == null)
+ return null;
return offset.getId();
}
@Override
public ZoneOffset convertToEntityAttribute(String string)
{
return offset.getId();
}
@Override
public ZoneOffset convertToEntityAttribute(String string)
{
+ if (string == null)
+ return null;
return ZoneOffset.of(string);
}
}
return ZoneOffset.of(string);
}
}
diff --git
a/src/main/java/de/juplo/jpa/converters/ZonedDateTimeConverter.java
b/src/main/java/de/juplo/jpa/converters/ZonedDateTimeConverter.java
index
63637ee
..
3816d1b
100644
(file)
--- a/
src/main/java/de/juplo/jpa/converters/ZonedDateTimeConverter.java
+++ b/
src/main/java/de/juplo/jpa/converters/ZonedDateTimeConverter.java
@@
-17,12
+17,16
@@
public class ZonedDateTimeConverter implements AttributeConverter<ZonedDateTime,
@Override
public Timestamp convertToDatabaseColumn(ZonedDateTime zdt)
{
@Override
public Timestamp convertToDatabaseColumn(ZonedDateTime zdt)
{
+ if (zdt == null)
+ return null;
return Timestamp.from(zdt.withZoneSameInstant(ZoneId.systemDefault()).toInstant());
}
@Override
public ZonedDateTime convertToEntityAttribute(Timestamp ts)
{
return Timestamp.from(zdt.withZoneSameInstant(ZoneId.systemDefault()).toInstant());
}
@Override
public ZonedDateTime convertToEntityAttribute(Timestamp ts)
{
+ if (ts == null)
+ return null;
return ZonedDateTime.ofInstant(ts.toInstant(), ZoneId.systemDefault());
}
}
return ZonedDateTime.ofInstant(ts.toInstant(), ZoneId.systemDefault());
}
}