build: Micronaut Framework 3.9.1 (micronaut-projects#1267)

AndreaLaGrotteria · May 4, 2023 · 1e1d9e4 · 1e1d9e4
1 parent 968832b
commit 1e1d9e4
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 63 deletions.
diff --git a/...Src/src/main/java/io/micronaut/guides/DefaultPomDependencyVersionResolverReplacement.java b/...Src/src/main/java/io/micronaut/guides/DefaultPomDependencyVersionResolverReplacement.java
@@ -5,6 +5,7 @@
 import io.micronaut.core.io.ResourceResolver;
 import io.micronaut.starter.build.dependencies.Coordinate;
 import io.micronaut.starter.build.dependencies.DefaultPomDependencyVersionResolver;
+import io.micronaut.starter.build.dependencies.StarterCoordinates;
 import jakarta.inject.Singleton;
 
 import java.util.Map;
@@ -23,6 +24,6 @@ public DefaultPomDependencyVersionResolverReplacement(ResourceResolver resourceR
     @Override
     @NonNull
     public Optional<Coordinate> resolve(@NonNull String artifactId) {
-        return Optional.ofNullable(coordinates.get(artifactId));
+        return Optional.ofNullable(coordinates.computeIfAbsent(artifactId, k -> StarterCoordinates.ALL_COORDINATES.get(artifactId)));
     }
 }
diff --git a/...cronaut-cloud-trace-base/groovy/src/main/groovy/example/micronaut/InventoryService.groovy b/...cronaut-cloud-trace-base/groovy/src/main/groovy/example/micronaut/InventoryService.groovy
@@ -1,7 +1,7 @@
 package example.micronaut
 
-import io.opentelemetry.extension.annotations.SpanAttribute
-import io.opentelemetry.extension.annotations.WithSpan
+import io.opentelemetry.instrumentation.annotations.SpanAttribute
+import io.opentelemetry.instrumentation.annotations.WithSpan
 import io.opentelemetry.api.trace.Span
 import io.opentelemetry.api.trace.Tracer
 import jakarta.inject.Singleton

diff --git a/...icronaut-cloud-trace-base/groovy/src/main/groovy/example/micronaut/WarehouseClient.groovy b/...icronaut-cloud-trace-base/groovy/src/main/groovy/example/micronaut/WarehouseClient.groovy
@@ -6,8 +6,8 @@ import io.micronaut.http.annotation.QueryValue
 import io.micronaut.http.client.annotation.Client
 import io.micronaut.tracing.annotation.ContinueSpan
 import io.micronaut.tracing.annotation.SpanTag
-import io.opentelemetry.extension.annotations.SpanAttribute
-import io.opentelemetry.extension.annotations.WithSpan
+import io.opentelemetry.instrumentation.annotations.SpanAttribute
+import io.opentelemetry.instrumentation.annotations.WithSpan
 
 import java.util.Map;
 

diff --git a/guides/micronaut-cloud-trace-base/java/src/main/java/example/micronaut/InventoryService.java b/guides/micronaut-cloud-trace-base/java/src/main/java/example/micronaut/InventoryService.java
@@ -1,7 +1,7 @@
 package example.micronaut;
 
-import io.opentelemetry.extension.annotations.SpanAttribute;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.SpanAttribute;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import jakarta.inject.Singleton;

diff --git a/guides/micronaut-cloud-trace-base/java/src/main/java/example/micronaut/WarehouseClient.java b/guides/micronaut-cloud-trace-base/java/src/main/java/example/micronaut/WarehouseClient.java
@@ -6,8 +6,8 @@
 import io.micronaut.http.client.annotation.Client;
 import io.micronaut.tracing.annotation.ContinueSpan;
 import io.micronaut.tracing.annotation.SpanTag;
-import io.opentelemetry.extension.annotations.SpanAttribute;
-import io.opentelemetry.extension.annotations.WithSpan;
+import io.opentelemetry.instrumentation.annotations.SpanAttribute;
+import io.opentelemetry.instrumentation.annotations.WithSpan;
 
 import java.util.Map;
 

diff --git a/...s/micronaut-cloud-trace-base/kotlin/src/main/kotlin/example/micronaut/InventoryService.kt b/...s/micronaut-cloud-trace-base/kotlin/src/main/kotlin/example/micronaut/InventoryService.kt
@@ -2,8 +2,8 @@ package example.micronaut
 
 import io.opentelemetry.api.trace.Span
 import io.opentelemetry.api.trace.Tracer
-import io.opentelemetry.extension.annotations.SpanAttribute
-import io.opentelemetry.extension.annotations.WithSpan
+import io.opentelemetry.instrumentation.annotations.SpanAttribute
+import io.opentelemetry.instrumentation.annotations.WithSpan
 import jakarta.inject.Singleton
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.abs

diff --git a/...es/micronaut-cloud-trace-base/kotlin/src/main/kotlin/example/micronaut/WarehouseClient.kt b/...es/micronaut-cloud-trace-base/kotlin/src/main/kotlin/example/micronaut/WarehouseClient.kt
@@ -7,8 +7,8 @@ import io.micronaut.http.annotation.QueryValue
 import io.micronaut.http.client.annotation.Client
 import io.micronaut.tracing.annotation.ContinueSpan
 import io.micronaut.tracing.annotation.SpanTag
-import io.opentelemetry.extension.annotations.SpanAttribute
-import io.opentelemetry.extension.annotations.WithSpan
+import io.opentelemetry.instrumentation.annotations.SpanAttribute
+import io.opentelemetry.instrumentation.annotations.WithSpan
 
 @Client("/warehouse") // <1>
 interface WarehouseClient {

diff --git a/guides/micronaut-custom-validation-annotation/metadata.json b/guides/micronaut-custom-validation-annotation/metadata.json
@@ -8,7 +8,7 @@
   "apps": [
     {
       "name": "default",
-      "features": ["junit-params"]
+      "features": ["junit-params", "micronaut-validation"]
     }
   ],
   "languages": ["java"]

diff --git a/guides/micronaut-data-access-mybatis/metadata.json b/guides/micronaut-data-access-mybatis/metadata.json
@@ -8,7 +8,7 @@
   "apps": [
     {
       "name": "default",
-      "features": ["graalvm", "flyway", "jdbc-hikari", "mybatis", "serialization-jackson"]
+      "features": ["graalvm", "flyway", "jdbc-hikari", "mybatis", "serialization-jackson", "micronaut-validation"]
     }
   ]
 }
diff --git a/guides/micronaut-error-handling/metadata.json b/guides/micronaut-error-handling/metadata.json
@@ -10,7 +10,7 @@
   "apps": [
     {
       "name": "default",
-      "features": ["graalvm", "views-velocity", "geb", "serialization-jackson"]
+      "features": ["graalvm", "views-velocity", "geb", "serialization-jackson", "micronaut-validation"]
     }
   ]
 }
diff --git a/guides/micronaut-metrics/src/main/resources/application.yml b/guides/micronaut-metrics/src/main/resources/application.yml
@@ -39,7 +39,6 @@ datasources:
     driverClassName: org.h2.Driver
     username: sa
     password: ''
-    schema-generate: CREATE_DROP
     dialect: H2
 #end::datasource[]
 netty:

diff --git a/guides/micronaut-microstream-persistence/metadata.json b/guides/micronaut-microstream-persistence/metadata.json
@@ -8,7 +8,7 @@
   "apps": [
     {
       "name": "default",
-      "features": ["microstream", "serialization-jackson"]
+      "features": ["microstream", "serialization-jackson", "micronaut-validation"]
     }
   ]
 }
diff --git a/...onaut-object-storage-gcp/java/src/test/java/example/micronaut/FakeGcsServerContainer.java b/...onaut-object-storage-gcp/java/src/test/java/example/micronaut/FakeGcsServerContainer.java
@@ -1,32 +1,22 @@
 package example.micronaut;
 
-import io.micronaut.core.io.socket.SocketUtils;
-import org.testcontainers.containers.FixedHostPortGenericContainer;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
 
-public class FakeGcsServerContainer extends FixedHostPortGenericContainer<FakeGcsServerContainer> {
+class FakeGcsServerContainer extends GenericContainer<FakeGcsServerContainer> {
 
-    public static final String DEFAULT_IMAGE_NAME = "fsouza/fake-gcs-server:1.40.1";
-    public static final int DEFAULT_PORT = 4443;
+    private static final String DEFAULT_IMAGE_NAME = "fsouza/fake-gcs-server:1.40.1";
+    private static final int DEFAULT_PORT = 4443;
 
-    private int port;
-
-    public FakeGcsServerContainer(String dockerImageName) {
-        super(dockerImageName);
-    }
-
-    @Override
-    protected void configure() {
-        super.configure();
-
-        this.port = SocketUtils.findAvailableTcpPort();
-        addFixedExposedPort(port, DEFAULT_PORT);
-
-        withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("/bin/fake-gcs-server", "-scheme", "http"));
+    public FakeGcsServerContainer() {
+        super(DEFAULT_IMAGE_NAME);
+        this.withExposedPorts(DEFAULT_PORT)
+                .withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("/bin/fake-gcs-server", "-scheme", "http"));
     }
 
-    public int getPort() {
-        return port;
+    public String getUrl() {
+        if (!isRunning()) {
+            start();
+        }
+        return String.format("http://%s:%s", getHost(), getMappedPort(DEFAULT_PORT));
     }
 }
diff --git a/...bject-storage-gcp/java/src/test/java/example/micronaut/ProfilePicturesControllerTest.java b/...bject-storage-gcp/java/src/test/java/example/micronaut/ProfilePicturesControllerTest.java
@@ -6,22 +6,17 @@
 import com.google.cloud.storage.BucketInfo;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
-import io.micronaut.context.annotation.Bean;
 import io.micronaut.context.annotation.Factory;
 import io.micronaut.context.annotation.Primary;
 import io.micronaut.context.annotation.Property;
 import io.micronaut.context.annotation.Requires;
-import io.micronaut.context.event.BeanCreatedEvent;
-import io.micronaut.context.event.BeanCreatedEventListener;
-import io.micronaut.core.annotation.NonNull;
-import io.micronaut.gcp.GoogleCloudConfiguration;
 import io.micronaut.objectstorage.googlecloud.GoogleCloudStorageConfiguration;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.io.IOException;
@@ -36,33 +31,25 @@ class ProfilePicturesControllerTest extends AbstractProfilePicturesControllerTes
 
     static final String SPEC_NAME = "ProfilePicturesControllerTest";
 
-    static FakeGcsServerContainer fakeGcs = new FakeGcsServerContainer(FakeGcsServerContainer.DEFAULT_IMAGE_NAME);
+    @Container
+    static FakeGcsServerContainer fakeGcs = new FakeGcsServerContainer();
 
     @Inject
     Storage client;
 
     @Inject
     GoogleCloudStorageConfiguration configuration;
 
-    @BeforeAll
-    static void beforeAll() {
-        fakeGcs.start();
-    }
-
     @BeforeEach
     void beforeEach() {
         client.create(BucketInfo.newBuilder(configuration.getBucket()).build());
     }
 
+    @AfterEach
     void afterEach() {
         client.get(configuration.getBucket()).delete();
     }
 
-    @AfterAll
-    static void afterAll() {
-        fakeGcs.stop();
-    }
-
     @Override
     protected void assertThatFileIsStored(String key, String expected) throws IOException {
         BlobId blobId = BlobId.of(configuration.getBucket(), key);
@@ -78,9 +65,8 @@ static class FakeGcsFactory {
         @Singleton
         @Primary
         Storage storage() {
-            String fakeGcsExternalUrl = String.format("http://%s:%s", fakeGcs.getHost(), fakeGcs.getPort());
             return StorageOptions.newBuilder()
-                    .setHost(fakeGcsExternalUrl)
+                    .setHost(fakeGcs.getUrl())
                     .setProjectId("test-project")
                     .setCredentials(NoCredentials.getInstance())
                     .build()

diff --git a/guides/micronaut-scope-types/metadata.json b/guides/micronaut-scope-types/metadata.json
@@ -9,7 +9,7 @@
   "apps": [
     {
       "name": "default",
-      "features": ["junit-params","management"]
+      "features": ["junit-params","management", "micronaut-validation"]
     }
   ]
 }
diff --git a/guides/micronaut-spring-boot/metadata.json b/guides/micronaut-spring-boot/metadata.json
@@ -8,7 +8,7 @@
   "apps": [
     {
       "name": "default",
-      "features": ["spring-web","spring-boot", "views-thymeleaf"]
+      "features": ["spring-web","spring-boot", "views-thymeleaf", "micronaut-validation"]
     }
   ]
 }
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-3.8.9
+3.9.1