upgrading catalogue service to micronaut version 4.3.4

oracle-quickstart · Mar 6, 2024 · 4324a3b · 4324a3b
1 parent 3ebe0c9
commit 4324a3b
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 22 deletions.
diff --git a/src/catalogue/app/build.gradle b/src/catalogue/app/build.gradle
@@ -1,6 +1,7 @@
 plugins {
- id("com.github.johnrengelman.shadow") version "7.1.2"
- id("io.micronaut.application") version "3.6.2"
+ id("com.github.johnrengelman.shadow") version "8.1.1"
+ id("io.micronaut.application") version "4.3.3"
+ id("io.micronaut.aot") version "4.3.3"
 }
 
 group = "micronaut.mushop"
@@ -16,16 +17,32 @@ micronaut {
  incremental(true)
  annotations("catalogue.*")
  }
+ aot {
+ optimizeServiceLoading = false
+ convertYamlToJava = false
+ precomputeOperations = true
+ cacheEnvironment = true
+ optimizeClassLoading = true
+ deduceEnvironment = true
+ optimizeNetty = true
+ }
 }
 
 dependencies {
  annotationProcessor("io.micronaut.micrometer:micronaut-micrometer-annotation")
  annotationProcessor("io.micronaut.data:micronaut-data-processor")
  annotationProcessor("io.micronaut.openapi:micronaut-openapi")
+ annotationProcessor("io.micronaut:micronaut-http-validation")
+ annotationProcessor("io.micronaut.serde:micronaut-serde-processor")
+ annotationProcessor("io.micronaut.tracing:micronaut-tracing-opentelemetry-annotation")
+ annotationProcessor("io.micronaut.validation:micronaut-validation-processor")
 
  implementation("io.micronaut:micronaut-http-client")
- implementation("io.micronaut:micronaut-runtime")
- implementation("io.micronaut:micronaut-validation")
+ implementation("io.micronaut:micronaut-retry")
+ // implementation("io.micronaut.flyway:micronaut-flyway:7.1.0")
+ implementation("io.micronaut.serde:micronaut-serde-jackson")
+ implementation("io.micronaut.validation:micronaut-validation")
+ implementation("jakarta.validation:jakarta.validation-api")
 
  // Metrics
  implementation("io.micronaut:micronaut-management")
@@ -39,26 +56,30 @@ dependencies {
  runtimeOnly("com.h2database:h2")
 
  // Tracing
- implementation("io.micronaut.tracing:micronaut-tracing-core")
- implementation("io.micronaut.tracing:micronaut-tracing-zipkin")
-
- implementation("io.swagger.core.v3:swagger-annotations")
-
- runtimeOnly("ch.qos.logback:logback-classic")
+ implementation("io.micronaut.tracing:micronaut-tracing-opentelemetry-http")
+ implementation("io.opentelemetry:opentelemetry-exporter-zipkin")
+
+
 
  // Caching
  implementation("io.micronaut.cache:micronaut-cache-caffeine")
 
+ compileOnly("io.micronaut.openapi:micronaut-openapi-annotations")
+
+ runtimeOnly("ch.qos.logback:logback-classic")
+ runtimeOnly("org.yaml:snakeyaml")
+
  testImplementation(project(":tck"))
+
 }
 
 application {
  mainClass.set("catalogue.Application")
 }
 
 java {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
+ sourceCompatibility = JavaVersion.toVersion("21")
+ targetCompatibility = JavaVersion.toVersion("21")
 }
 
 if (javaBaseImage == "graalvm") {

diff --git a/src/catalogue/app/src/main/java/catalogue/controllers/CatalogueItemDTO.java b/src/catalogue/app/src/main/java/catalogue/controllers/CatalogueItemDTO.java
@@ -1,11 +1,13 @@
 package catalogue.controllers;
 
 import io.micronaut.core.annotation.Introspected;
+import io.micronaut.serde.annotation.Serdeable;
 
 /**
  * Represents a product in the catalog
  */
 @Introspected
+@Serdeable
 public class CatalogueItemDTO {
 
  private final String id;
@@ -47,76 +49,87 @@ public CatalogueItemDTO(
 
  /**
  * The id of the product
+ * @return 
  */
  public String getId() {
  return id;
  }
 
  /**
  * The brand of the product
+ * @return 
  */
  public String getBrand() {
  return brand;
  }
 
  /**
  * The title of the product
+ * @return 
  */
  public String getTitle() {
  return title;
  }
 
  /**
  * The description of the product
+ * @return 
  */
  public String getDescription() {
  return description;
  }
 
  /**
  * The weight of the product
+ * @return 
  */
  public String getWeight() {
  return weight;
  }
 
  /**
  * The size of the product
+ * @return 
  */
  public String getProductSize() {
  return productSize;
  }
 
  /**
  * The available colors of the product
+ * @return 
  */
  public String getColors() {
  return colors;
  }
 
  /**
  * The quantity of the product
+ * @return 
  */
  public int getQty() {
  return qty;
  }
 
  /**
  * The price of the product
+ * @return 
  */
  public double getPrice() {
  return price;
  }
 
  /**
  * An array of size 2 with the first image being the thumbnail and the second the full size image
+ * @return 
  */
  public String[] getImageUrl() {
  return imageUrl;
  }
 
  /**
  * The categories of the image
+ * @return 
  */
  public String[] getCategory() {
  return category;

diff --git a/src/catalogue/app/src/main/java/catalogue/controllers/CatalogueSizeDTO.java b/src/catalogue/app/src/main/java/catalogue/controllers/CatalogueSizeDTO.java
@@ -1,11 +1,13 @@
 package catalogue.controllers;
 
 import io.micronaut.core.annotation.Introspected;
+import io.micronaut.serde.annotation.Serdeable;
 
 /**
  * Returns the size of the catalogue
  */
 @Introspected
+@Serdeable
 public class CatalogueSizeDTO {
 
  private final int size;

diff --git a/src/catalogue/app/src/main/java/catalogue/controllers/CategoriesDTO.java b/src/catalogue/app/src/main/java/catalogue/controllers/CategoriesDTO.java
@@ -1,13 +1,15 @@
 package catalogue.controllers;
 
 import io.micronaut.core.annotation.Introspected;
+import io.micronaut.serde.annotation.Serdeable;
 
 import java.util.List;
 
 /**
  * Lists the available categories
  */
 @Introspected
+@Serdeable
 public class CategoriesDTO {
 
  private final String[] categories;

diff --git a/src/catalogue/app/src/main/java/catalogue/db/DbSetup.java b/src/catalogue/app/src/main/java/catalogue/db/DbSetup.java
@@ -12,7 +12,7 @@
 import org.slf4j.LoggerFactory;
 
 import javax.sql.DataSource;
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
@@ -44,7 +44,7 @@ public DbSetup(DataSource dataSource,
 
  @EventListener
  @Transactional
- void init(StartupEvent startupEvent) {
+ void onStartupEvent(StartupEvent startupEvent) {
  if (repository.count() > 0) {
  return;
  }

diff --git a/src/catalogue/app/src/main/java/catalogue/model/Category.java b/src/catalogue/app/src/main/java/catalogue/model/Category.java
@@ -5,7 +5,7 @@
 import io.micronaut.data.annotation.Id;
 import io.micronaut.data.annotation.MappedEntity;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 import java.util.Objects;
 
 @MappedEntity("CATEGORIES")

diff --git a/src/catalogue/app/src/main/java/catalogue/model/Product.java b/src/catalogue/app/src/main/java/catalogue/model/Product.java
@@ -4,10 +4,10 @@
 import io.micronaut.data.annotation.MappedEntity;
 import io.micronaut.data.annotation.MappedProperty;
 import io.micronaut.data.annotation.Relation;
-import io.micronaut.data.jdbc.annotation.JoinColumn;
-import io.micronaut.data.jdbc.annotation.JoinTable;
+import io.micronaut.data.annotation.sql.JoinColumn;
+import io.micronaut.data.annotation.sql.JoinTable;
 
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 import java.util.Collections;
 import java.util.List;
 

diff --git a/src/catalogue/app/src/main/java/catalogue/repositories/ProductRepository.java b/src/catalogue/app/src/main/java/catalogue/repositories/ProductRepository.java
@@ -8,7 +8,7 @@
 import io.micronaut.data.model.query.builder.sql.Dialect;
 import io.micronaut.data.repository.PageableRepository;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Optional;
 

diff --git a/src/catalogue/app/src/main/resources/logback.xml b/src/catalogue/app/src/main/resources/logback.xml
@@ -1,7 +1,6 @@
 <configuration>
 
  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <withJansi>true</withJansi>
  <!-- encoders are assigned the type
  ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
  <encoder>

diff --git a/src/catalogue/gradle.properties b/src/catalogue/gradle.properties
@@ -1,3 +1,3 @@
-micronautVersion=3.7.3
+micronautVersion=4.3.4
 version=2.0.0-SNAPSHOT
 javaBaseImage=graalvm
diff --git a/src/catalogue/gradle/wrapper/gradle-wrapper.properties b/src/catalogue/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists