New upstream version 4.3.14

1 files changed, 129 insertions, 0 deletions

diff --git a/spring-context/src/test/java/org/springframework/cache/interceptor/CacheProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheProxyFactoryBeanTests.java
new file mode 100644
index 00000000..0e6a9a1b
--- /dev/null
+++ b/spring-context/src/test/java/org/springframework/cache/interceptor/CacheProxyFactoryBeanTests.java
@@ -0,0 +1,129 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cache.interceptor;
+
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.Test;
+
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.junit.Assert.*;
+
+/**
+ * Integration tests for {@link CacheProxyFactoryBean}.
+ *
+ * @author John Blum
+ * @author Juergen Hoeller
+ */
+public class CacheProxyFactoryBeanTests {
+
+	@Test
+	public void configurationClassWithCacheProxyFactoryBean() {
+		try (AnnotationConfigApplicationContext applicationContext =
+				new AnnotationConfigApplicationContext(CacheProxyFactoryBeanConfiguration.class)) {
+			Greeter greeter = applicationContext.getBean("greeter", Greeter.class);
+			assertNotNull(greeter);
+			assertFalse(greeter.isCacheMiss());
+			assertEquals("Hello John!", greeter.greet("John"));
+			assertTrue(greeter.isCacheMiss());
+			assertEquals("Hello Jon!", greeter.greet("Jon"));
+			assertTrue(greeter.isCacheMiss());
+			assertEquals("Hello John!", greeter.greet("John"));
+			assertFalse(greeter.isCacheMiss());
+			assertEquals("Hello World!", greeter.greet());
+			assertTrue(greeter.isCacheMiss());
+			assertEquals("Hello World!", greeter.greet());
+			assertFalse(greeter.isCacheMiss());
+		}
+	}
+
+
+	@Configuration
+	@EnableCaching
+	static class CacheProxyFactoryBeanConfiguration {
+
+		@Bean
+		ConcurrentMapCacheManager cacheManager() {
+			return new ConcurrentMapCacheManager("Greetings");
+		}
+
+		@Bean
+		CacheProxyFactoryBean greeter() {
+			CacheProxyFactoryBean factoryBean = new CacheProxyFactoryBean();
+			factoryBean.setCacheOperationSources(newCacheOperationSource("greet", newCacheOperation("Greetings")));
+			factoryBean.setTarget(new SimpleGreeter());
+			return factoryBean;
+		}
+
+		CacheOperationSource newCacheOperationSource(String methodName, CacheOperation... cacheOperations) {
+			NameMatchCacheOperationSource cacheOperationSource = new NameMatchCacheOperationSource();
+			cacheOperationSource.addCacheMethod(methodName, Arrays.asList(cacheOperations));
+			return cacheOperationSource;
+		}
+
+		CacheableOperation newCacheOperation(String cacheName) {
+			CacheableOperation.Builder builder = new CacheableOperation.Builder();
+			builder.setCacheManager("cacheManager");
+			builder.setCacheName(cacheName);
+			return builder.build();
+		}
+	}
+
+
+	interface Greeter {
+
+		default boolean isCacheHit() {
+			return !isCacheMiss();
+		}
+
+		boolean isCacheMiss();
+
+		void setCacheMiss();
+
+		default String greet() {
+			return greet("World");
+		}
+
+		default String greet(String name) {
+			setCacheMiss();
+			return String.format("Hello %s!", name);
+		}
+	}
+
+
+	static class SimpleGreeter implements Greeter {
+
+		private final AtomicBoolean cacheMiss = new AtomicBoolean(false);
+
+		@Override
+		public boolean isCacheMiss() {
+			return this.cacheMiss.getAndSet(false);
+		}
+
+		@Override
+		public void setCacheMiss() {
+			this.cacheMiss.set(true);
+		}
+	}
+
+}