root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Stephane Nicoll 2016-01-22 04:34:46 +01:00
parent a12f23936c
commit cd903e26de
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCacheManager.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -179,7 +179,7 @@ public class ConcurrentMapCacheManager implements CacheManager, BeanClassLoaderA
*/ */
protected Cache createConcurrentMapCache(String name) { protected Cache createConcurrentMapCache(String name) {
SerializationDelegate actualSerialization = SerializationDelegate actualSerialization =
this.storeByValue ? serialization : null; this.storeByValue ? this.serialization : null;
return new ConcurrentMapCache(name, new ConcurrentHashMap<Object, Object>(256), return new ConcurrentMapCache(name, new ConcurrentHashMap<Object, Object>(256),
isAllowNullValues(), actualSerialization); isAllowNullValues(), actualSerialization);

18
spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -197,14 +197,14 @@ class CacheAdviceParser extends AbstractSingleBeanDefinitionParser {
Props(Element root) { Props(Element root) {
String defaultCache = root.getAttribute("cache"); String defaultCache = root.getAttribute("cache");
key = root.getAttribute("key"); this.key = root.getAttribute("key");
keyGenerator = root.getAttribute("key-generator"); this.keyGenerator = root.getAttribute("key-generator");
cacheManager = root.getAttribute("cache-manager"); this.cacheManager = root.getAttribute("cache-manager");
condition = root.getAttribute("condition"); this.condition = root.getAttribute("condition");
method = root.getAttribute(METHOD_ATTRIBUTE); this.method = root.getAttribute(METHOD_ATTRIBUTE);
if (StringUtils.hasText(defaultCache)) { if (StringUtils.hasText(defaultCache)) {
caches = StringUtils.commaDelimitedListToStringArray(defaultCache.trim()); this.caches = StringUtils.commaDelimitedListToStringArray(defaultCache.trim());
} }
} }
@ -212,12 +212,12 @@ class CacheAdviceParser extends AbstractSingleBeanDefinitionParser {
String cache = element.getAttribute("cache"); String cache = element.getAttribute("cache");
// sanity check // sanity check
String[] localCaches = caches; String[] localCaches = this.caches;
if (StringUtils.hasText(cache)) { if (StringUtils.hasText(cache)) {
localCaches = StringUtils.commaDelimitedListToStringArray(cache.trim()); localCaches = StringUtils.commaDelimitedListToStringArray(cache.trim());
} }
else { else {
if (caches == null) { if (this.caches == null) {
readerCtx.error("No cache specified specified for " + element.getNodeName(), element); readerCtx.error("No cache specified specified for " + element.getNodeName(), element);
} }
} }

4
spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -101,7 +101,7 @@ public abstract class CacheOperation implements BasicOperation {
} }
public void setCacheResolver(String cacheResolver) { public void setCacheResolver(String cacheResolver) {
Assert.notNull(cacheManager); Assert.notNull(this.cacheManager);
this.cacheResolver = cacheResolver; this.cacheResolver = cacheResolver;
} }

4
spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperationInvoker.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -52,7 +52,7 @@ public interface CacheOperationInvoker {
} }
public Throwable getOriginal() { public Throwable getOriginal() {
return original; return this.original;
} }
} }

4
spring-context/src/main/java/org/springframework/cache/interceptor/CachePutOperation.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -29,7 +29,7 @@ public class CachePutOperation extends CacheOperation {
public String getUnless() { public String getUnless() {
return unless; return this.unless;
} }
public void setUnless(String unless) { public void setUnless(String unless) {

6
spring-context/src/main/java/org/springframework/cache/interceptor/CacheableOperation.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -31,7 +31,7 @@ public class CacheableOperation extends CacheOperation {
public String getUnless() { public String getUnless() {
return unless; return this.unless;
} }
public void setUnless(String unless) { public void setUnless(String unless) {
@ -39,7 +39,7 @@ public class CacheableOperation extends CacheOperation {
} }
public boolean isSync() { public boolean isSync() {
return sync; return this.sync;
} }
public void setSync(boolean sync) { public void setSync(boolean sync) {

4
spring-context/src/main/java/org/springframework/cache/interceptor/NamedCacheResolver.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -51,7 +51,7 @@ public class NamedCacheResolver extends AbstractCacheResolver {
@Override @Override
protected Collection<String> getCacheNames(CacheOperationInvocationContext<?> context) { protected Collection<String> getCacheNames(CacheOperationInvocationContext<?> context) {
return cacheNames; return this.cacheNames;
} }
} }

4
spring-context/src/main/java/org/springframework/cache/interceptor/SimpleKey.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -57,7 +57,7 @@ public class SimpleKey implements Serializable {
@Override @Override
public final int hashCode() { public final int hashCode() {
return hashCode; return this.hashCode;
} }
@Override @Override

4
spring-context/src/main/java/org/springframework/cache/interceptor/VariableNotAvailableException.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -37,6 +37,6 @@ class VariableNotAvailableException extends EvaluationException {
public String getName() { public String getName() {
return name; return this.name;
} }
} }