Upgrade to Micronaut 3.1.4 (#112)

* Prepare micronaut 3; refactor + passing test * Rework HttpClient in Connect test * Update gradle.properties * Migrate to 3.1.4 * Migrate to graalVM 21.3.0
michelin · Nov 26, 2021 · 685eb2b · 685eb2b
1 parent f66b3ca
commit 685eb2b
Show file tree

Hide file tree

Showing 75 changed files with 241 additions and 218 deletions.
diff --git a/.github/workflows/on_pull_request.yml b/.github/workflows/on_pull_request.yml
@@ -13,7 +13,7 @@ jobs:
         fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
     - uses: DeLaGuardo/[email protected]
       with:
-        graalvm: '21.1.0'
+        graalvm: '21.3.0'
         java: 'java11'
     - name: Install Native Image
       run: gu install native-image

diff --git a/.github/workflows/on_push_master.yml b/.github/workflows/on_push_master.yml
@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - uses: DeLaGuardo/[email protected]
         with:
-          graalvm: '21.1.0'
+          graalvm: '21.3.0'
           java: 'java11'
       - name: Install Native Image
         run: gu install native-image
@@ -60,7 +60,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - uses: DeLaGuardo/[email protected]
         with:
-          graalvm: '20.3.2'
+          graalvm: '21.3.0'
           java: 'java11'
       - name: Install Native Image
         run: ${{ env.JAVA_HOME }}\bin\gu.cmd install native-image

diff --git a/.github/workflows/on_push_tag.yml b/.github/workflows/on_push_tag.yml
@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - uses: DeLaGuardo/[email protected]
         with:
-          graalvm: '21.1.0'
+          graalvm: '21.3.0'
           java: 'java11'
       - name: Install Native Image
         run: gu install native-image
@@ -62,7 +62,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - uses: DeLaGuardo/[email protected]
         with:
-          graalvm: '20.3.2'
+          graalvm: '21.3.0'
           java: 'java11'
       - name: Install Native Image
         run: ${{ env.JAVA_HOME }}\bin\gu.cmd install native-image

diff --git a/api/build.gradle b/api/build.gradle
@@ -21,14 +21,18 @@ micronaut {
 
 dependencies {
     compileOnly 'org.projectlombok:lombok:1.18.20'
+    compileOnly("com.google.code.findbugs:jsr305")
+
     annotationProcessor 'org.projectlombok:lombok:1.18.20'
     annotationProcessor("io.micronaut.openapi:micronaut-openapi")
     annotationProcessor("io.micronaut:micronaut-management")
     annotationProcessor("io.micronaut.security:micronaut-security-annotations")
     annotationProcessor("io.swagger.core.v3:swagger-annotations")
+    annotationProcessor("io.micronaut:micronaut-http-validation")
 
     implementation("io.micronaut:micronaut-validation")
     implementation("io.micronaut:micronaut-runtime")
+    implementation("io.micronaut.rxjava3:micronaut-rxjava3")
     implementation("javax.annotation:javax.annotation-api")
     implementation("io.micronaut:micronaut-http-client")
     implementation("io.micronaut.openapi:micronaut-openapi")
@@ -43,7 +47,7 @@ dependencies {
     testAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
     testCompileOnly 'org.projectlombok:lombok:1.18.16'
 
-
+    testImplementation("io.micronaut.rxjava3:micronaut-rxjava3-http-client:2.0.0")
     testImplementation 'org.testcontainers:kafka:1.15.3'
     testImplementation "org.testcontainers:junit-jupiter"
     testImplementation 'org.mockito:mockito-inline:3.7.7'

diff --git a/api/src/main/java/com/michelin/ns4kafka/Application.java b/api/src/main/java/com/michelin/ns4kafka/Application.java
@@ -2,7 +2,6 @@
 
 import io.micronaut.openapi.annotation.OpenAPIInclude;
 import io.micronaut.runtime.Micronaut;
-import io.reactivex.plugins.RxJavaPlugins;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn;
 import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
@@ -30,7 +29,6 @@
 public class Application {
 
     public static void main(String[] args) {
-        RxJavaPlugins.setErrorHandler(throwable -> {});
         Micronaut.run(Application.class, args);
     }
 }
diff --git a/api/src/main/java/com/michelin/ns4kafka/controllers/AccessControlListController.java b/api/src/main/java/com/michelin/ns4kafka/controllers/AccessControlListController.java
@@ -12,7 +12,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.validation.Valid;
 import java.time.Instant;
 import java.util.Comparator;

diff --git a/api/src/main/java/com/michelin/ns4kafka/controllers/AkhqClaimProviderController.java b/api/src/main/java/com/michelin/ns4kafka/controllers/AkhqClaimProviderController.java
@@ -12,7 +12,7 @@
 import lombok.Getter;
 
 import javax.annotation.security.RolesAllowed;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;

diff --git a/api/src/main/java/com/michelin/ns4kafka/controllers/ConnectController.java b/api/src/main/java/com/michelin/ns4kafka/controllers/ConnectController.java
@@ -11,7 +11,7 @@
 import io.micronaut.scheduling.annotation.ExecuteOn;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.validation.Valid;
 import java.time.Instant;
 import java.util.Date;

diff --git a/api/src/main/java/com/michelin/ns4kafka/controllers/ConsumerGroupController.java b/api/src/main/java/com/michelin/ns4kafka/controllers/ConsumerGroupController.java
@@ -11,7 +11,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.kafka.common.TopicPartition;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.validation.Valid;
 import java.time.Instant;
 import java.util.Date;

diff --git a/api/src/main/java/com/michelin/ns4kafka/controllers/NamespaceController.java b/api/src/main/java/com/michelin/ns4kafka/controllers/NamespaceController.java
@@ -8,7 +8,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import javax.annotation.security.RolesAllowed;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.validation.Valid;
 import java.time.Instant;
 import java.util.ArrayList;

diff --git a/api/src/main/java/com/michelin/ns4kafka/controllers/NamespacedResourceController.java b/api/src/main/java/com/michelin/ns4kafka/controllers/NamespacedResourceController.java
@@ -3,7 +3,7 @@
 import com.michelin.ns4kafka.models.Namespace;
 import com.michelin.ns4kafka.services.NamespaceService;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * Base Controller for all Namespaced resources

diff --git a/api/src/main/java/com/michelin/ns4kafka/controllers/ResourceController.java b/api/src/main/java/com/michelin/ns4kafka/controllers/ResourceController.java
@@ -7,7 +7,7 @@
 import io.micronaut.http.HttpResponse;
 import io.micronaut.security.utils.SecurityService;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.time.Instant;
 import java.util.Date;
 

diff --git a/api/src/main/java/com/michelin/ns4kafka/controllers/RoleBindingController.java b/api/src/main/java/com/michelin/ns4kafka/controllers/RoleBindingController.java
@@ -11,7 +11,7 @@
 import io.micronaut.scheduling.annotation.ExecuteOn;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.validation.Valid;
 import java.time.Instant;
 import java.util.Date;

diff --git a/api/src/main/java/com/michelin/ns4kafka/controllers/StreamController.java b/api/src/main/java/com/michelin/ns4kafka/controllers/StreamController.java
@@ -8,7 +8,7 @@
 import io.micronaut.http.annotation.*;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.validation.Valid;
 import java.time.Instant;
 import java.util.Date;

diff --git a/api/src/main/java/com/michelin/ns4kafka/controllers/TopicController.java b/api/src/main/java/com/michelin/ns4kafka/controllers/TopicController.java
@@ -11,7 +11,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.kafka.common.TopicPartition;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.validation.Valid;
 import java.time.Instant;
 import java.util.Date;

diff --git a/api/src/main/java/com/michelin/ns4kafka/logs/ConsoleLogListener.java b/api/src/main/java/com/michelin/ns4kafka/logs/ConsoleLogListener.java
@@ -6,7 +6,7 @@
 import io.micronaut.core.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Slf4j
 @Singleton

diff --git a/api/src/main/java/com/michelin/ns4kafka/logs/KafkaLogListener.java b/api/src/main/java/com/michelin/ns4kafka/logs/KafkaLogListener.java
@@ -9,8 +9,8 @@
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.scheduling.annotation.Async;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Requires(property = "ns4kafka.log.kafka.enabled", value = StringUtils.TRUE)

diff --git a/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/DelayStartupListener.java b/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/DelayStartupListener.java
@@ -6,7 +6,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.List;
 
 @Slf4j

diff --git a/...main/java/com/michelin/ns4kafka/repositories/kafka/KafkaAccessControlEntryRepository.java b/...main/java/com/michelin/ns4kafka/repositories/kafka/KafkaAccessControlEntryRepository.java
@@ -7,7 +7,7 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.producer.Producer;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.Collection;
 import java.util.Optional;
 

diff --git a/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/KafkaConnectorRepository.java b/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/KafkaConnectorRepository.java
@@ -7,7 +7,7 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.producer.Producer;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.stream.Collectors;
 

diff --git a/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/KafkaNamespaceRepository.java b/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/KafkaNamespaceRepository.java
@@ -7,7 +7,7 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.producer.Producer;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;

diff --git a/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/KafkaRoleBindingRepository.java b/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/KafkaRoleBindingRepository.java
@@ -7,7 +7,7 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.producer.Producer;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/KafkaStore.java b/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/KafkaStore.java
@@ -19,8 +19,8 @@
 import org.apache.kafka.common.errors.TopicExistsException;
 
 import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

diff --git a/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/KafkaStreamRepository.java b/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/KafkaStreamRepository.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import com.michelin.ns4kafka.models.KafkaStream;
 import com.michelin.ns4kafka.repositories.StreamRepository;

diff --git a/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/KafkaTopicRepository.java b/api/src/main/java/com/michelin/ns4kafka/repositories/kafka/KafkaTopicRepository.java
@@ -10,7 +10,7 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.producer.Producer;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.stream.Collectors;
 

diff --git a/api/src/main/java/com/michelin/ns4kafka/security/ResourceBasedSecurityRule.java b/api/src/main/java/com/michelin/ns4kafka/security/ResourceBasedSecurityRule.java
@@ -4,18 +4,20 @@
 import com.michelin.ns4kafka.repositories.NamespaceRepository;
 import com.michelin.ns4kafka.repositories.RoleBindingRepository;
 import io.micronaut.core.annotation.Nullable;
+import io.micronaut.core.async.publisher.Publishers;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.http.HttpRequest;
+import io.micronaut.security.authentication.Authentication;
 import io.micronaut.security.rules.SecurityRule;
 import io.micronaut.security.rules.SecurityRuleResult;
 import io.micronaut.web.router.RouteMatch;
+import jakarta.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
+import org.reactivestreams.Publisher;
 
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -39,18 +41,24 @@ public ResourceBasedSecurityRule(SecurityConfig securityConfig, RoleBindingRepos
         this.roleBindingRepository = roleBindingRepository;
         this.namespaceRepository = namespaceRepository;
     }
-
     @Override
-    public SecurityRuleResult check(HttpRequest<?> request, @Nullable RouteMatch<?> routeMatch, @Nullable Map<String, Object> claims) {
+    public Publisher<SecurityRuleResult> check(HttpRequest<?> request, @Nullable RouteMatch<?> routeMatch, @Nullable Authentication authentication) {
+        return Publishers.just(check_security(request, routeMatch, authentication));
+    }
+
+    public SecurityRuleResult check_security(HttpRequest<?> request, @Nullable RouteMatch<?> routeMatch, @Nullable Authentication authentication) {
         //Unauthenticated request
-        if (claims == null || !claims.keySet().containsAll( List.of("groups", "sub", "roles"))) {
+        if(authentication == null){
+            return SecurityRuleResult.UNKNOWN;
+        }
+        if (!authentication.getAttributes().keySet().containsAll( List.of("groups", "sub", "roles"))) {
             log.debug("No Authentication available for path [{}]. Returning unknown.",request.getPath());
             return SecurityRuleResult.UNKNOWN;
         }
 
-        String sub = claims.get("sub").toString();
-        List<String> groups = (List<String>) claims.get("groups");
-        List<String> roles = (List<String>) claims.get("roles");
+        String sub = authentication.getName();
+        List<String> groups = (List<String>) authentication.getAttributes().get("groups");
+        Collection<String> roles = authentication.getRoles();
 
         //Request to a URL that is not in the scope of this SecurityRule
         Matcher matcher = namespacedResourcePattern.matcher(request.getPath());

diff --git a/api/src/main/java/com/michelin/ns4kafka/security/gitlab/GitlabApiClient.java b/api/src/main/java/com/michelin/ns4kafka/security/gitlab/GitlabApiClient.java
@@ -4,13 +4,11 @@
 import io.micronaut.http.annotation.Get;
 import io.micronaut.http.annotation.Header;
 import io.micronaut.http.client.annotation.Client;
-import io.reactivex.Flowable;
+import io.reactivex.rxjava3.core.Flowable;
 
 import java.util.List;
 import java.util.Map;
 
-import static io.micronaut.http.HttpRequest.GET;
-
 @Client("${micronaut.security.gitlab.url}")
 public interface GitlabApiClient {
     @Get("/api/v4/groups?min_access_level=10&sort=asc&page={page}")

diff --git a/api/src/main/java/com/michelin/ns4kafka/security/gitlab/GitlabAuthenticationProvider.java b/api/src/main/java/com/michelin/ns4kafka/security/gitlab/GitlabAuthenticationProvider.java
@@ -1,17 +1,17 @@
 package com.michelin.ns4kafka.security.gitlab;
 
 import com.michelin.ns4kafka.security.ResourceBasedSecurityRule;
-import edu.umd.cs.findbugs.annotations.Nullable;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.security.authentication.*;
-import io.reactivex.BackpressureStrategy;
-import io.reactivex.Flowable;
-import io.reactivex.schedulers.Schedulers;
+import io.reactivex.rxjava3.core.BackpressureStrategy;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import lombok.extern.slf4j.Slf4j;
 import org.reactivestreams.Publisher;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.Map;
 
@@ -35,8 +35,7 @@ public Publisher<AuthenticationResponse> authenticate(@Nullable HttpRequest<?> h
                 String username = gitlabAuthenticationService.findUsername(token).blockingGet();
                 List<String> groups = gitlabAuthenticationService.findAllGroups(token).toList().blockingGet();
 
-                UserDetails user = new UserDetails(username, resourceBasedSecurityRule.computeRolesFromGroups(groups), Map.of("groups", groups));
-
+                AuthenticationResponse user = AuthenticationResponse.success(username, resourceBasedSecurityRule.computeRolesFromGroups(groups), Map.of("groups", groups));
                 emitter.onNext(user);
                 emitter.onComplete();
             }catch (Exception e){

diff --git a/api/src/main/java/com/michelin/ns4kafka/security/gitlab/GitlabAuthenticationService.java b/api/src/main/java/com/michelin/ns4kafka/security/gitlab/GitlabAuthenticationService.java
@@ -2,18 +2,16 @@
 
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.http.HttpResponse;
-import io.reactivex.Flowable;
-import io.reactivex.Maybe;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.Maybe;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static io.micronaut.http.HttpRequest.GET;
-
 @Slf4j
 @Singleton
 public class GitlabAuthenticationService {