Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Use Spring's nullability annotations where used as part of API nullability indicators.

See #2385
This commit is contained in:
Mark Paluch
2021-06-17 08:48:56 +02:00
parent e57238fe60
commit c24ba262ca
39 changed files with 125 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/convert/ConfigurableTypeInformationMapper.java
View File

@@ -19,13 +19,12 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import javax.annotation.Nullable;
import org.springframework.data.mapping.Alias;
import org.springframework.data.mapping.PersistentEntity;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.util.ClassTypeInformation;
import org.springframework.data.util.TypeInformation;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
/**

26
src/main/java/org/springframework/data/convert/JodaTimeConverters.java
View File

@@ -23,12 +23,12 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import javax.annotation.Nonnull;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.springframework.core.convert.converter.Converter;
import org.springframework.lang.NonNull;
import org.springframework.util.ClassUtils;
/**
@@ -82,7 +82,7 @@ public abstract class JodaTimeConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public java.time.LocalDateTime convert(LocalDateTime source) {
return java.time.LocalDateTime.ofInstant(source.toDate().toInstant(), ZoneId.systemDefault());
@@ -94,7 +94,7 @@ public abstract class JodaTimeConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Date convert(LocalDate source) {
return source.toDate();
@@ -106,7 +106,7 @@ public abstract class JodaTimeConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Date convert(LocalDateTime source) {
return source.toDate();
@@ -118,7 +118,7 @@ public abstract class JodaTimeConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Date convert(DateTime source) {
return source.toDate();
@@ -130,7 +130,7 @@ public abstract class JodaTimeConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public LocalDate convert(Date source) {
return new LocalDate(source.getTime());
@@ -142,7 +142,7 @@ public abstract class JodaTimeConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public LocalDateTime convert(Date source) {
return new LocalDateTime(source.getTime());
@@ -154,7 +154,7 @@ public abstract class JodaTimeConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public DateTime convert(Date source) {
return new DateTime(source.getTime());
@@ -167,7 +167,7 @@ public abstract class JodaTimeConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public LocalDateTime convert(java.time.LocalDateTime source) {
return LocalDateTime.fromDateFields(Jsr310Converters.LocalDateTimeToDateConverter.INSTANCE.convert(source));
@@ -179,7 +179,7 @@ public abstract class JodaTimeConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public LocalDateTime convert(java.time.Instant source) {
return LocalDateTime.fromDateFields(new Date(source.toEpochMilli()));
@@ -191,7 +191,7 @@ public abstract class JodaTimeConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Instant convert(LocalDateTime source) {
return Instant.ofEpochMilli(source.toDateTime().getMillis());
@@ -203,7 +203,7 @@ public abstract class JodaTimeConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public DateTime convert(java.time.LocalDateTime source) {
return new DateTime(Jsr310Converters.LocalDateTimeToDateConverter.INSTANCE.convert(source));

34
src/main/java/org/springframework/data/convert/Jsr310Converters.java
View File

@@ -33,8 +33,6 @@ import java.util.Collection;
import java.util.Date;
import java.util.List;
import javax.annotation.Nonnull;
import org.springframework.core.convert.converter.Converter;
import org.springframework.lang.NonNull;
@@ -93,7 +91,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public LocalDateTime convert(Date source) {
return ofInstant(source.toInstant(), systemDefault());
@@ -105,7 +103,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Date convert(LocalDateTime source) {
return Date.from(source.atZone(systemDefault()).toInstant());
@@ -117,7 +115,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public LocalDate convert(Date source) {
return ofInstant(ofEpochMilli(source.getTime()), systemDefault()).toLocalDate();
@@ -129,7 +127,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Date convert(LocalDate source) {
return Date.from(source.atStartOfDay(systemDefault()).toInstant());
@@ -141,7 +139,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public LocalTime convert(Date source) {
return ofInstant(ofEpochMilli(source.getTime()), systemDefault()).toLocalTime();
@@ -153,7 +151,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Date convert(LocalTime source) {
return Date.from(source.atDate(LocalDate.now()).atZone(systemDefault()).toInstant());
@@ -165,7 +163,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Instant convert(Date source) {
return source.toInstant();
@@ -177,7 +175,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Date convert(Instant source) {
return Date.from(source);
@@ -189,7 +187,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Instant convert(LocalDateTime source) {
return source.atZone(systemDefault()).toInstant();
@@ -201,7 +199,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public LocalDateTime convert(Instant source) {
return LocalDateTime.ofInstant(source, systemDefault());
@@ -213,7 +211,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public String convert(ZoneId source) {
return source.toString();
@@ -225,7 +223,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public ZoneId convert(String source) {
return ZoneId.of(source);
@@ -237,7 +235,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public String convert(Duration duration) {
return duration.toString();
@@ -249,7 +247,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Duration convert(String s) {
return Duration.parse(s);
@@ -261,7 +259,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public String convert(Period period) {
return period.toString();
@@ -273,7 +271,7 @@ public abstract class Jsr310Converters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Period convert(String s) {
return Period.parse(s);

30
src/main/java/org/springframework/data/convert/ThreeTenBackPortConverters.java
View File

@@ -27,10 +27,10 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import javax.annotation.Nonnull;
import org.springframework.core.convert.converter.Converter;
import org.springframework.lang.NonNull;
import org.springframework.util.ClassUtils;
import org.threeten.bp.Instant;
import org.threeten.bp.LocalDate;
import org.threeten.bp.LocalDateTime;
@@ -107,7 +107,7 @@ public abstract class ThreeTenBackPortConverters {
* (non-Javadoc)
* @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
*/
@Nonnull
@NonNull
@Override
public java.time.LocalDateTime convert(LocalDateTime source) {
@@ -122,7 +122,7 @@ public abstract class ThreeTenBackPortConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public LocalDateTime convert(Date source) {
return ofInstant(toInstant(source), systemDefault());
@@ -134,7 +134,7 @@ public abstract class ThreeTenBackPortConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Date convert(LocalDateTime source) {
return toDate(source.atZone(systemDefault()).toInstant());
@@ -146,7 +146,7 @@ public abstract class ThreeTenBackPortConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public LocalDate convert(Date source) {
return ofInstant(ofEpochMilli(source.getTime()), systemDefault()).toLocalDate();
@@ -158,7 +158,7 @@ public abstract class ThreeTenBackPortConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Date convert(LocalDate source) {
return toDate(source.atStartOfDay(systemDefault()).toInstant());
@@ -170,7 +170,7 @@ public abstract class ThreeTenBackPortConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public LocalTime convert(Date source) {
return ofInstant(ofEpochMilli(source.getTime()), systemDefault()).toLocalTime();
@@ -182,7 +182,7 @@ public abstract class ThreeTenBackPortConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Date convert(LocalTime source) {
return toDate(source.atDate(LocalDate.now()).atZone(systemDefault()).toInstant());
@@ -194,7 +194,7 @@ public abstract class ThreeTenBackPortConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Instant convert(Date source) {
return toInstant(source);
@@ -206,7 +206,7 @@ public abstract class ThreeTenBackPortConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public Date convert(Instant source) {
return toDate(source.atZone(systemDefault()).toInstant());
@@ -218,7 +218,7 @@ public abstract class ThreeTenBackPortConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public java.time.Instant convert(LocalDateTime source) {
return java.time.Instant.ofEpochMilli(source.atZone(ZoneOffset.systemDefault()).toInstant().toEpochMilli());
@@ -230,7 +230,7 @@ public abstract class ThreeTenBackPortConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public LocalDateTime convert(java.time.Instant source) {
return LocalDateTime.ofInstant(Instant.ofEpochMilli(source.toEpochMilli()), ZoneOffset.systemDefault());
@@ -243,7 +243,7 @@ public abstract class ThreeTenBackPortConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public String convert(ZoneId source) {
return source.toString();
@@ -256,7 +256,7 @@ public abstract class ThreeTenBackPortConverters {
INSTANCE;
@Nonnull
@NonNull
@Override
public ZoneId convert(String source) {
return ZoneId.of(source);

3
src/main/java/org/springframework/data/convert/TypeInformationMapper.java
View File

@@ -15,10 +15,9 @@
*/
package org.springframework.data.convert;
import javax.annotation.Nullable;
import org.springframework.data.mapping.Alias;
import org.springframework.data.util.TypeInformation;
import org.springframework.lang.Nullable;
/**
* Interface to abstract the mapping from a type alias to the actual type.