Polishing

This commit is contained in:
Juergen Hoeller
2018-08-13 14:23:41 +02:00
parent 5bd5df3ec4
commit 484a2f3f2d
12 changed files with 79 additions and 99 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
package org.springframework.cache.jcache;
import java.util.concurrent.Callable;
import javax.cache.Cache;
import javax.cache.processor.EntryProcessor;
import javax.cache.processor.EntryProcessorException;
import javax.cache.processor.MutableEntry;
@@ -36,14 +37,14 @@ import org.springframework.util.Assert;
*/
public class JCacheCache extends AbstractValueAdaptingCache {
private final javax.cache.Cache<Object, Object> cache;
private final Cache<Object, Object> cache;
/**
* Create an {@link org.springframework.cache.jcache.JCacheCache} instance.
* @param jcache backing JCache Cache instance
*/
public JCacheCache(javax.cache.Cache<Object, Object> jcache) {
public JCacheCache(Cache<Object, Object> jcache) {
this(jcache, true);
}
@@ -52,7 +53,7 @@ public class JCacheCache extends AbstractValueAdaptingCache {
* @param jcache backing JCache Cache instance
* @param allowNullValues whether to accept and convert null values for this cache
*/
public JCacheCache(javax.cache.Cache<Object, Object> jcache, boolean allowNullValues) {
public JCacheCache(Cache<Object, Object> jcache, boolean allowNullValues) {
super(allowNullValues);
Assert.notNull(jcache, "Cache must not be null");
this.cache = jcache;
@@ -65,7 +66,7 @@ public class JCacheCache extends AbstractValueAdaptingCache {
}
@Override
public final javax.cache.Cache<Object, Object> getNativeCache() {
public final Cache<Object, Object> getNativeCache() {
return this.cache;
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ import org.springframework.cache.transaction.AbstractTransactionSupportingCacheM
*/
public class JCacheCacheManager extends AbstractTransactionSupportingCacheManager {
private javax.cache.CacheManager cacheManager;
private CacheManager cacheManager;
private boolean allowNullValues = true;
@@ -60,14 +60,14 @@ public class JCacheCacheManager extends AbstractTransactionSupportingCacheManage
/**
* Set the backing JCache {@link javax.cache.CacheManager}.
*/
public void setCacheManager(javax.cache.CacheManager cacheManager) {
public void setCacheManager(CacheManager cacheManager) {
this.cacheManager = cacheManager;
}
/**
* Return the backing JCache {@link javax.cache.CacheManager}.
*/
public javax.cache.CacheManager getCacheManager() {
public CacheManager getCacheManager() {
return this.cacheManager;
}