Fix tests

build.gradle

@@ -49,6 +49,7 @@ subprojects { Project subproject ->
         isBuildSnapshot = version.toString().endsWith("-SNAPSHOT")
     }
     repositories {
+        mavenLocal()
         maven { url "https://repo.grails.org/grails/core" }
         maven { url "https://oss.jfrog.org/oss-snapshot-local/" }
     }
@@ -75,8 +76,6 @@ subprojects { Project subproject ->
 
     bintray.publish = true
 
-    apply plugin: "org.gradle.test-retry"
-
     tasks.withType(Test) {
         jvmArgs '-Duser.country=US'
         jvmArgs '-Duser.language=en'
@@ -88,12 +87,6 @@ subprojects { Project subproject ->
             System.out.flush()
         }
 
-        retry {
-            failOnPassedAfterRetry = false
-            maxFailures = 10
-            maxRetries = 5
-        }
-
         reports.html.enabled = !System.getenv("TRAVIS")
         reports.junitXml.enabled = !System.getenv("TRAVIS")
     }

cache-caffeine/build.gradle

@@ -8,4 +8,7 @@ dependencies {
     testImplementation 'org.jsr107.ri:cache-ri-impl:1.1.1'
     testImplementation "com.github.ben-manes.caffeine:caffeine:2.8.0"
     testImplementation "io.micronaut:micronaut-inject-groovy"
+    testImplementation "io.micronaut:micronaut-http-client"
+    testImplementation "io.micronaut:micronaut-management"
+    testImplementation "io.micronaut:micronaut-http-server-netty"
 }

cache-core/src/test/groovy/io/micronaut/cache/SyncCacheJavaSpec.groovy → cache-caffeine/src/test/groovy/io/micronaut/cache/SyncCacheJavaSpec.groovy

@@ -29,7 +29,6 @@ class SyncCacheJavaSpec extends Specification {
                 'micronaut.caches.counter.initialCapacity':10,
                 'micronaut.caches.counter.maximumSize':20,
                 'micronaut.caches.counter.testMode':true
-
         )
 
         when:

cache-caffeine/src/test/groovy/io/micronaut/cache/client/CachingRxJavaCrudSpec.groovy

@@ -0,0 +1,237 @@
+/*
+ * Copyright 2017-2019 original 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 io.micronaut.cache.client;
+
+import io.micronaut.cache.annotation.CacheInvalidate
+import io.micronaut.cache.annotation.CachePut
+import io.micronaut.cache.annotation.Cacheable
+import io.micronaut.context.ApplicationContext
+import io.micronaut.http.HttpResponse
+import io.micronaut.http.HttpStatus
+import io.micronaut.http.annotation.Controller
+import io.micronaut.http.annotation.Delete
+import io.micronaut.http.annotation.Get
+import io.micronaut.http.annotation.Patch
+import io.micronaut.http.annotation.Post
+import io.micronaut.http.client.annotation.Client
+import io.micronaut.runtime.server.EmbeddedServer
+import io.reactivex.Maybe
+import io.reactivex.MaybeEmitter
+import io.reactivex.MaybeOnSubscribe
+import io.reactivex.Single
+import io.reactivex.annotations.NonNull
+import spock.lang.AutoCleanup
+import spock.lang.Shared
+import spock.lang.Specification
+
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic.AtomicLong
+
+class CachingRxJavaCrudSpec extends Specification {
+
+    @Shared
+    @AutoCleanup
+    ApplicationContext context = ApplicationContext.run(
+            'micronaut.caches.books.maximum-size': 20,
+            'micronaut.caches.book-list.maximum-size': 20
+    )
+
+    @Shared
+    EmbeddedServer embeddedServer = context.getBean(EmbeddedServer).start()
+
+    void "test it is possible to implement CRUD operations with RxJava"() {
+        given:
+        BookClient client = context.getBean(BookClient)
+        BookController bookController = context.getBean(BookController)
+
+        when:
+        Book book = client.get(99)
+                .blockingGet()
+        List<Book> books = client.list().blockingGet()
+
+        then:
+        book == null
+        books.size() == 0
+
+        when:
+        book = client.save("The Stand").blockingGet()
+
+        then:
+        book != null
+        book.title == "The Stand"
+        book.id == 1
+
+        when:
+        book = client.get(book.id).blockingGet()
+
+        then:
+        book != null
+        book.title == "The Stand"
+        book.id == 1
+        bookController.getInvocationCount.get() == 2
+
+
+        when:
+        book = client.get(book.id).blockingGet()
+
+        then:
+        book != null
+        book.title == "The Stand"
+        book.id == 1
+        bookController.getInvocationCount.get() == 2
+
+        when:'the full response is resolved'
+        HttpResponse<Book> bookAndResponse = client.getResponse(book.id).blockingGet()
+
+        then:"The response is valid"
+        bookAndResponse.status() == HttpStatus.OK
+        bookAndResponse.body().title == "The Stand"
+
+        when:
+        book = client.update(book.id, "The Shining").blockingGet()
+
+        then:
+        book != null
+        book.title == "The Shining"
+        book.id == 1
+
+        when:
+        book = client.get(book.id).blockingGet()
+
+        then:
+        book != null
+        book.title == "The Shining"
+        book.id == 1
+        bookController.getInvocationCount.get() == 3
+
+        when:
+        book = client.delete(book.id).blockingGet()
+
+        then:
+        book != null
+
+        when:
+        book = client.get(book.id)
+                .blockingGet()
+        then:
+        book == null
+    }
+
+
+    @Client('/rxjava/caching/books')
+    static interface BookClient extends BookApi {
+    }
+
+    @Controller("/rxjava/caching/books")
+    static class BookController implements BookApi {
+
+        Map<Long, Book> books = new LinkedHashMap<>()
+        AtomicLong currentId = new AtomicLong(0)
+        AtomicInteger getInvocationCount = new AtomicInteger()
+
+        @Override
+        Maybe<Book> get(Long id) {
+            Maybe.create(new MaybeOnSubscribe<Book>() {
+                @Override
+                void subscribe(@NonNull MaybeEmitter<Book> emitter) throws Exception {
+                    getInvocationCount.incrementAndGet()
+                    Book book = books.get(id)
+                    if(book) {
+                        emitter.onSuccess(book)
+                    } else {
+                        emitter.onComplete()
+                    }
+                }
+            })
+        }
+
+        @Override
+        Single<HttpResponse<Book>> getResponse(Long id) {
+            Book book = books.get(id)
+            if(book) {
+                return Single.just(HttpResponse.ok(book))
+            }
+            return Single.just(HttpResponse.notFound())
+        }
+
+        @Override
+        Single<List<Book>> list() {
+            return Single.just(books.values().toList())
+        }
+
+        @Override
+        Maybe<Book> delete(Long id) {
+            Book book = books.remove(id)
+            if(book) {
+                return Maybe.just(book)
+            }
+            return Maybe.empty()
+        }
+
+        @Override
+        Single<Book> save(String title) {
+            Book book = new Book(title: title, id:currentId.incrementAndGet())
+            books[book.id] = book
+            return Single.just(book)
+        }
+
+        @Override
+        Maybe<Book> update(Long id, String title) {
+            Book book = books[id]
+            if(book != null) {
+                book.title = title
+                return Maybe.just(book)
+            }
+            else {
+                return Maybe.empty()
+            }
+        }
+    }
+
+    static interface BookApi {
+
+        @Get("/{id}")
+        @Cacheable("books")
+        Maybe<Book> get(Long id)
+
+        @Get("/res/{id}")
+        @Cacheable("books")
+        Single<HttpResponse<Book>> getResponse(Long id)
+
+        @Get
+        @Cacheable("book-list")
+        Single<List<Book>> list()
+
+        @Delete("/{id}")
+        @CacheInvalidate("books")
+        Maybe<Book> delete(Long id)
+
+        @Post
+        @CachePut("books")
+        Single<Book> save(String title)
+
+        @Patch("/{id}")
+        @CacheInvalidate("books")
+        Maybe<Book> update(Long id, String title)
+    }
+
+
+    static class Book {
+        Long id
+        String title
+    }
+}
+

cache-core/build.gradle

@@ -5,6 +5,7 @@ dependencies {
     api "io.micronaut:micronaut-runtime"
 
     compileOnly "javax.cache:cache-api"
+    compileOnly "io.micronaut:micronaut-management"
 
     compileOnly "ch.qos.logback:logback-classic:1.2.3"
     testImplementation "ch.qos.logback:logback-classic:1.2.3"

cache-core/src/main/java/io/micronaut/cache/discovery/CachingCompositeDiscoveryClient.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2017-2020 original 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 io.micronaut.cache.discovery;
+
+import io.micronaut.cache.annotation.Cacheable;
+import io.micronaut.context.annotation.Primary;
+import io.micronaut.context.annotation.Replaces;
+import io.micronaut.context.annotation.Requires;
+import io.micronaut.core.util.StringUtils;
+import io.micronaut.discovery.CompositeDiscoveryClient;
+import io.micronaut.discovery.DefaultCompositeDiscoveryClient;
+import io.micronaut.discovery.DiscoveryClient;
+import io.micronaut.discovery.ServiceInstance;
+import io.reactivex.Flowable;
+
+import java.util.List;
+
+/**
+ * Replaces the default {@link io.micronaut.discovery.DefaultCompositeDiscoveryClient} with one that caches the return
+ * values.
+ *
+ * @author Graeme Rocher
+ * @since 1.0
+ */
+@Primary
+@Requires(beans = DiscoveryClientCacheConfiguration.class)
+@Replaces(DefaultCompositeDiscoveryClient.class)
+public class CachingCompositeDiscoveryClient extends CompositeDiscoveryClient {
+
+    /**
+     * @param discoveryClients The discovery clients
+     */
+    public CachingCompositeDiscoveryClient(DiscoveryClient[] discoveryClients) {
+        super(discoveryClients);
+    }
+
+    @Override
+    @Cacheable(DiscoveryClientCacheConfiguration.CACHE_NAME)
+    public Flowable<List<ServiceInstance>> getInstances(String serviceId) {
+        return super.getInstances(serviceId);
+    }
+
+    @Override
+    @Cacheable(DiscoveryClientCacheConfiguration.CACHE_NAME)
+    public Flowable<List<String>> getServiceIds() {
+        return super.getServiceIds();
+    }
+}