Fix overridden methods nullability

Issue: SPR-15869
This commit is contained in:
Sebastien Deleuze
2017-08-17 14:30:14 +02:00
parent 6b6c1d3e53
commit 73cf07e9a4
488 changed files with 1016 additions and 34 deletions

View File

@@ -83,6 +83,7 @@ public class CaffeineCache extends AbstractValueAdaptingCache {
}
@Override
@Nullable
public ValueWrapper get(Object key) {
if (this.cache instanceof LoadingCache) {
Object value = ((LoadingCache<Object, Object>) this.cache).get(key);

View File

@@ -176,6 +176,7 @@ public class CaffeineCacheManager implements CacheManager {
}
@Override
@Nullable
public Cache getCache(String name) {
Cache cache = this.cacheMap.get(name);
if (cache == null && this.dynamic) {

View File

@@ -64,6 +64,7 @@ public class EhCacheCache implements Cache {
}
@Override
@Nullable
public ValueWrapper get(Object key) {
Element element = lookup(key);
return toValueWrapper(element);
@@ -125,6 +126,7 @@ public class EhCacheCache implements Cache {
}
@Override
@Nullable
public ValueWrapper putIfAbsent(Object key, @Nullable Object value) {
Element existingElement = this.cache.putIfAbsent(new Element(key, value));
return toValueWrapper(existingElement);

View File

@@ -287,6 +287,7 @@ public class EhCacheFactoryBean extends CacheConfiguration implements FactoryBea
@Override
@Nullable
public Ehcache getObject() {
return this.cache;
}

View File

@@ -169,6 +169,7 @@ public class EhCacheManagerFactoryBean implements FactoryBean<CacheManager>, Ini
@Override
@Nullable
public CacheManager getObject() {
return this.cacheManager;
}

View File

@@ -76,6 +76,7 @@ public class JCacheCache extends AbstractValueAdaptingCache {
}
@Override
@Nullable
public <T> T get(Object key, Callable<T> valueLoader) {
try {
return this.cache.invoke(key, new ValueLoaderEntryProcessor<T>(), valueLoader);
@@ -91,6 +92,7 @@ public class JCacheCache extends AbstractValueAdaptingCache {
}
@Override
@Nullable
public ValueWrapper putIfAbsent(Object key, @Nullable Object value) {
boolean set = this.cache.putIfAbsent(key, toStoreValue(value));
return (set ? null : get(key));

View File

@@ -85,6 +85,7 @@ public class JCacheManagerFactoryBean
@Override
@Nullable
public CacheManager getObject() {
return this.cacheManager;
}

View File

@@ -72,6 +72,7 @@ public class TransactionAwareCacheDecorator implements Cache {
}
@Override
@Nullable
public ValueWrapper get(Object key) {
return this.targetCache.get(key);
}
@@ -82,6 +83,7 @@ public class TransactionAwareCacheDecorator implements Cache {
}
@Override
@Nullable
public <T> T get(Object key, Callable<T> valueLoader) {
return this.targetCache.get(key, valueLoader);
}
@@ -102,6 +104,7 @@ public class TransactionAwareCacheDecorator implements Cache {
}
@Override
@Nullable
public ValueWrapper putIfAbsent(Object key, @Nullable Object value) {
return this.targetCache.putIfAbsent(key, value);
}

View File

@@ -76,6 +76,7 @@ public class TransactionAwareCacheManagerProxy implements CacheManager, Initiali
@Override
@Nullable
public Cache getCache(String name) {
Assert.state(this.targetCacheManager != null, "No target CacheManager set");
Cache targetCache = this.targetCacheManager.getCache(name);

View File

@@ -123,6 +123,7 @@ public class MailSendException extends MailException {
@Override
@Nullable
public String getMessage() {
if (ObjectUtils.isEmpty(this.messageExceptions)) {
return super.getMessage();

View File

@@ -110,6 +110,7 @@ public class TimerManagerFactoryBean extends TimerManagerAccessor
//---------------------------------------------------------------------
@Override
@Nullable
public TimerManager getObject() {
return getTimerManager();
}

View File

@@ -56,6 +56,7 @@ public class TimerManagerTaskScheduler extends TimerManagerAccessor implements T
@Override
@Nullable
public ScheduledFuture<?> schedule(Runnable task, Trigger trigger) {
return new ReschedulingTimerListener(errorHandlingTask(task, true), trigger).schedule();
}

View File

@@ -266,6 +266,7 @@ public class CronTriggerFactoryBean implements FactoryBean<CronTrigger>, BeanNam
@Override
@Nullable
public CronTrigger getObject() {
return this.cronTrigger;
}

View File

@@ -218,6 +218,7 @@ public class JobDetailFactoryBean
@Override
@Nullable
public JobDetail getObject() {
return this.jobDetail;
}

View File

@@ -223,6 +223,7 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod
@Override
@Nullable
public JobDetail getObject() {
return this.jobDetail;
}

View File

@@ -708,6 +708,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
}
@Override
@Nullable
public Scheduler getObject() {
return this.scheduler;
}

View File

@@ -251,6 +251,7 @@ public class SimpleTriggerFactoryBean implements FactoryBean<SimpleTrigger>, Bea
@Override
@Nullable
public SimpleTrigger getObject() {
return this.simpleTrigger;
}

View File

@@ -65,6 +65,7 @@ public class FreeMarkerConfigurationFactoryBean extends FreeMarkerConfigurationF
@Override
@Nullable
public Configuration getObject() {
return this.configuration;
}