Merge pull request #38 from agorapulse/chore/replace-rxjava-with-reactor

Replace RxJava with Reactor

build.gradle

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

docs/guide/guide.gradle

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath("org.ajoberstar.grgit:grgit-core:$grgitVersion")
+    }
+}
+
 plugins {
     id 'org.kordamp.gradle.guide'
     id 'org.ajoberstar.git-publish'

examples/micronaut-log4aws-demo/micronaut-log4aws-demo.gradle

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

examples/micronaut-log4aws-demo/src/main/java/com/agorapulse/micronaut/log4aws/demo/LoggingDemo.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

examples/micronaut-log4aws-demo/src/main/java/com/agorapulse/micronaut/log4aws/demo/LoggingService.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

examples/micronaut-log4aws-demo/src/main/resources/log4j2.xml

@@ -3,7 +3,7 @@
 
     SPDX-License-Identifier: Apache-2.0
 
-    Copyright 2020-2023 Agorapulse.
+    Copyright 2020-2024 Agorapulse.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

examples/micronaut-log4aws-demo/src/main/resources/sentry.properties

@@ -1,7 +1,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright 2020-2023 Agorapulse.
+# Copyright 2020-2024 Agorapulse.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

examples/micronaut-log4aws-demo/src/test/groovy/com/agorapulse/micronaut/log4aws/demo/LoggingServiceSpec.groovy

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

gradle.properties

@@ -1,7 +1,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright 2020-2023 Agorapulse.
+# Copyright 2020-2024 Agorapulse.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ kordampPluginVersion = 0.53.0
 coverallsPluginVersion = 2.9.0
 gitPublishPluginVersion = 2.1.3
 nexusPluginVersion=1.0.0
+grgitVersion=5.0.0
 
 micronautVersion = 4.2.0
 micronautGradlePluginVersion = 4.2.0

settings.gradle

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/micronaut-log4aws.gradle

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ dependencies {
     compileOnly 'io.micronaut:micronaut-function'
     compileOnly 'io.micronaut:micronaut-http'
     implementation 'io.micronaut:micronaut-aop'
-    implementation 'io.reactivex.rxjava2:rxjava'
+    implementation 'io.micronaut.reactor:micronaut-reactor'
 
     testImplementation 'io.micronaut.validation:micronaut-validation'
     testImplementation 'io.micronaut:micronaut-http-server-netty'

subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/AwsLambdaEventProcessor.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/Log4AwsFactory.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/LogError.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/LogExceptionsInterceptor.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/function/Logging.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/function/LoggingFunctionInitializer.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/http/MDCFilter.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,14 @@
 import io.micronaut.http.annotation.Filter;
 import io.micronaut.http.filter.HttpServerFilter;
 import io.micronaut.http.filter.ServerFilterChain;
-import io.reactivex.Flowable;
 import org.reactivestreams.Publisher;
+import reactor.core.publisher.Flux;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -50,13 +54,13 @@ public int getOrder() {
     @Override
     public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
         Map<String, String> tags = getTags(request);
-        return Flowable
+        return Flux
             .just(request)
             .switchMap(r -> {
                 TagHelper.setTags(tags);
                 return chain.proceed(request);
             })
-            .doFinally(() -> TagHelper.clearTags(tags));
+            .doFinally(signal -> TagHelper.clearTags(tags));
     }
 
     public Map<String, String> getTags(HttpRequest<?> request) {

subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/http/MicronautRequestEventProcessor.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/http/ReactiveSentryFilter.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,10 @@
 import io.micronaut.http.annotation.Filter;
 import io.micronaut.http.filter.HttpServerFilter;
 import io.micronaut.http.filter.ServerFilterChain;
-import io.reactivex.Flowable;
 import io.sentry.Breadcrumb;
 import io.sentry.IHub;
 import org.reactivestreams.Publisher;
+import reactor.core.publisher.Flux;
 
 @Filter("/**")
 @Requires(property = "sentry.filter.type", value = "reactive")
@@ -48,7 +48,7 @@ public int getOrder() {
 
     @Override
     public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
-        return Flowable
+        return Flux
             .just(request)
             .doOnNext(r -> {
                 hub.pushScope();
@@ -58,7 +58,7 @@ public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, Server
                 });
             })
             .switchMap(r -> chain.proceed(request))
-            .doFinally(hub::popScope);
+            .doFinally(signal -> hub.popScope());
     }
 
 }

subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/http/SentryFilter.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,10 @@
 import io.micronaut.http.annotation.Filter;
 import io.micronaut.http.filter.HttpServerFilter;
 import io.micronaut.http.filter.ServerFilterChain;
-import io.reactivex.Flowable;
 import io.sentry.Breadcrumb;
 import io.sentry.IHub;
 import org.reactivestreams.Publisher;
+import reactor.core.publisher.Flux;
 
 @Filter("/**")
 public class SentryFilter implements HttpServerFilter {
@@ -44,7 +44,7 @@ public int getOrder() {
 
     @Override
     public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
-        return Flowable
+        return Flux
             .just(request)
             .switchMap(r -> {
                 hub.pushScope();

subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/slf4j/LoggerWithTags.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/slf4j/TagHelper.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/LogErrorInterceptorSpec.groovy

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/GlobalErrorHandler.groovy

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/MockHub.java

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/SentryFilterSpec.groovy

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/TestController.groovy

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/test/resources/log4j2.xml

@@ -3,7 +3,7 @@
 
     SPDX-License-Identifier: Apache-2.0
 
-    Copyright 2020-2023 Agorapulse.
+    Copyright 2020-2024 Agorapulse.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

subprojects/micronaut-log4aws/src/test/resources/sentry.properties

@@ -1,7 +1,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright 2020-2023 Agorapulse.
+# Copyright 2020-2024 Agorapulse.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

testprojects/micronaut-log4aws-test-lambda-only/micronaut-log4aws-test-lambda-only.gradle

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2023 Agorapulse.
+ * Copyright 2020-2024 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.