Merge pull request #67 from piomin/renovate/major-micronaut.version

Update dependency io.micronaut:micronaut-inject-java to v4
piomin · Apr 30, 2024 · 688edcd · 688edcd
2 parents 71d7b70 + 299caad
commit 688edcd
Show file tree

Hide file tree

Showing 12 changed files with 95 additions and 28 deletions.
diff --git a/department-service/pom.xml b/department-service/pom.xml
@@ -20,6 +20,11 @@
             <groupId>io.micronaut</groupId>
             <artifactId>micronaut-http-server-netty</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.micronaut.serde</groupId>
+            <artifactId>micronaut-serde-jackson</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>io.micronaut</groupId>
             <artifactId>micronaut-http-client</artifactId>
@@ -34,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>io.micronaut.tracing</groupId>
-            <artifactId>micronaut-tracing-zipkin</artifactId>
+            <artifactId>micronaut-tracing-brave-http</artifactId>
         </dependency>
         <dependency>
             <groupId>io.micronaut.discovery</groupId>
@@ -112,6 +117,17 @@
                             <artifactId>micronaut-openapi</artifactId>
                             <version>${micronaut.openapi.version}</version>
                         </path>
+                        <path>
+                            <groupId>io.micronaut.serde</groupId>
+                            <artifactId>micronaut-serde-processor</artifactId>
+                            <version>${micronaut.serialization.version}</version>
+                            <exclusions>
+                                <exclusion>
+                                    <groupId>io.micronaut</groupId>
+                                    <artifactId>micronaut-inject</artifactId>
+                                </exclusion>
+                            </exclusions>
+                        </path>
                     </annotationProcessorPaths>
                     <compilerArgs>
                         <arg>-Amicronaut.processing.group=pl.piomin.services</arg>

diff --git a/...-service/src/main/java/pl/piomin/services/department/controller/DepartmentController.java b/...-service/src/main/java/pl/piomin/services/department/controller/DepartmentController.java
@@ -20,11 +20,14 @@ public class DepartmentController {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(DepartmentController.class);
 
-	@Inject
 	DepartmentRepository repository;
-	@Inject
 	EmployeeClient employeeClient;
-
+
+	public DepartmentController(DepartmentRepository repository, EmployeeClient employeeClient) {
+		this.repository = repository;
+		this.employeeClient = employeeClient;
+	}
+
 	@Post
 	public Department add(@Body Department department) {
 		LOGGER.info("Department add: {}", department);

diff --git a/department-service/src/main/java/pl/piomin/services/department/model/Department.java b/department-service/src/main/java/pl/piomin/services/department/model/Department.java
@@ -1,5 +1,6 @@
 package pl.piomin.services.department.model;
 
+import io.micronaut.serde.annotation.Serdeable;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -12,6 +13,7 @@
 @Setter
 @ToString
 @NoArgsConstructor
+@Serdeable
 public class Department {
 
 	private Long id;

diff --git a/department-service/src/main/java/pl/piomin/services/department/model/Employee.java b/department-service/src/main/java/pl/piomin/services/department/model/Employee.java
@@ -1,5 +1,6 @@
 package pl.piomin.services.department.model;
 
+import io.micronaut.serde.annotation.Serdeable;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -9,6 +10,7 @@
 @Getter
 @ToString
 @NoArgsConstructor
+@Serdeable
 public class Employee {
 
 	private Long id;

diff --git a/employee-service/pom.xml b/employee-service/pom.xml
@@ -20,6 +20,11 @@
             <groupId>io.micronaut</groupId>
             <artifactId>micronaut-http-server-netty</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.micronaut.serde</groupId>
+            <artifactId>micronaut-serde-jackson</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>io.micronaut</groupId>
             <artifactId>micronaut-inject</artifactId>
@@ -34,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>io.micronaut.tracing</groupId>
-            <artifactId>micronaut-tracing-zipkin</artifactId>
+            <artifactId>micronaut-tracing-brave-http</artifactId>
         </dependency>
         <dependency>
             <groupId>io.micronaut.discovery</groupId>
@@ -108,6 +113,17 @@
                             <artifactId>micronaut-openapi</artifactId>
                             <version>${micronaut.openapi.version}</version>
                         </path>
+                        <path>
+                            <groupId>io.micronaut.serde</groupId>
+                            <artifactId>micronaut-serde-processor</artifactId>
+                            <version>${micronaut.serialization.version}</version>
+                            <exclusions>
+                                <exclusion>
+                                    <groupId>io.micronaut</groupId>
+                                    <artifactId>micronaut-inject</artifactId>
+                                </exclusion>
+                            </exclusions>
+                        </path>
                     </annotationProcessorPaths>
                     <compilerArgs>
                         <arg>-Amicronaut.processing.group=pl.piomin.services</arg>

diff --git a/employee-service/src/main/java/pl/piomin/services/employee/model/Employee.java b/employee-service/src/main/java/pl/piomin/services/employee/model/Employee.java
@@ -1,5 +1,6 @@
 package pl.piomin.services.employee.model;
 
+import io.micronaut.serde.annotation.Serdeable;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -9,6 +10,7 @@
 @Setter
 @ToString
 @NoArgsConstructor
+@Serdeable
 public class Employee {
 
 	private Long id;

diff --git a/organization-service/pom.xml b/organization-service/pom.xml
@@ -20,6 +20,11 @@
             <groupId>io.micronaut</groupId>
             <artifactId>micronaut-http-server-netty</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.micronaut.serde</groupId>
+            <artifactId>micronaut-serde-jackson</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>io.micronaut</groupId>
             <artifactId>micronaut-http-client</artifactId>
@@ -38,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>io.micronaut.tracing</groupId>
-            <artifactId>micronaut-tracing-zipkin</artifactId>
+            <artifactId>micronaut-tracing-brave-http</artifactId>
         </dependency>
         <dependency>
             <groupId>io.micronaut.discovery</groupId>
@@ -112,6 +117,17 @@
                             <artifactId>micronaut-openapi</artifactId>
                             <version>${micronaut.openapi.version}</version>
                         </path>
+                        <path>
+                            <groupId>io.micronaut.serde</groupId>
+                            <artifactId>micronaut-serde-processor</artifactId>
+                            <version>${micronaut.serialization.version}</version>
+                            <exclusions>
+                                <exclusion>
+                                    <groupId>io.micronaut</groupId>
+                                    <artifactId>micronaut-inject</artifactId>
+                                </exclusion>
+                            </exclusions>
+                        </path>
                     </annotationProcessorPaths>
                     <compilerArgs>
                         <arg>-Amicronaut.processing.group=pl.piomin.services</arg>

diff --git a/...vice/src/main/java/pl/piomin/services/organization/controller/OrganizationController.java b/...vice/src/main/java/pl/piomin/services/organization/controller/OrganizationController.java
@@ -4,7 +4,6 @@
 import io.micronaut.http.annotation.Controller;
 import io.micronaut.http.annotation.Get;
 import io.micronaut.http.annotation.Post;
-import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pl.piomin.services.organization.client.DepartmentClient;
@@ -19,13 +18,16 @@ public class OrganizationController {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(OrganizationController.class);
 
-	@Inject
 	OrganizationRepository repository;
-	@Inject
 	DepartmentClient departmentClient;
-	@Inject
 	EmployeeClient employeeClient;
-
+
+	public OrganizationController(OrganizationRepository repository, DepartmentClient departmentClient, EmployeeClient employeeClient) {
+		this.repository = repository;
+		this.departmentClient = departmentClient;
+		this.employeeClient = employeeClient;
+	}
+
 	@Post
 	public Organization add(@Body Organization organization) {
 		LOGGER.info("Organization add: {}", organization);
@@ -46,23 +48,23 @@ public Organization findById(Long id) {
 
 	@Get("/{id}/with-departments")
 	public Organization findByIdWithDepartments(Long id) {
-		LOGGER.info("Organization find: id={}", id);
+		LOGGER.info("Organization find with departments: id={}", id);
 		Organization organization = repository.findById(id);
 		organization.setDepartments(departmentClient.findByOrganization(organization.getId()));
 		return organization;
 	}
 
 	@Get("/{id}/with-departments-and-employees")
 	public Organization findByIdWithDepartmentsAndEmployees(Long id) {
-		LOGGER.info("Organization find: id={}", id);
+		LOGGER.info("Organization find with departments and employees: id={}", id);
 		Organization organization = repository.findById(id);
 		organization.setDepartments(departmentClient.findByOrganizationWithEmployees(organization.getId()));
 		return organization;
 	}
 
 	@Get("/{id}/with-employees")
 	public Organization findByIdWithEmployees(Long id) {
-		LOGGER.info("Organization find: id={}", id);
+		LOGGER.info("Organization find with employees: id={}", id);
 		Organization organization = repository.findById(id);
 		organization.setEmployees(employeeClient.findByOrganization(organization.getId()));
 		return organization;

diff --git a/organization-service/src/main/java/pl/piomin/services/organization/model/Department.java b/organization-service/src/main/java/pl/piomin/services/organization/model/Department.java
@@ -1,8 +1,11 @@
 package pl.piomin.services.organization.model;
 
+import io.micronaut.serde.annotation.Serdeable;
+
 import java.util.ArrayList;
 import java.util.List;
 
+@Serdeable
 public class Department {
 
 	private Long id;

diff --git a/organization-service/src/main/java/pl/piomin/services/organization/model/Employee.java b/organization-service/src/main/java/pl/piomin/services/organization/model/Employee.java
@@ -1,5 +1,8 @@
 package pl.piomin.services.organization.model;
 
+import io.micronaut.serde.annotation.Serdeable;
+
+@Serdeable
 public class Employee {
 
 	private Long id;

diff --git a/organization-service/src/main/java/pl/piomin/services/organization/model/Organization.java b/organization-service/src/main/java/pl/piomin/services/organization/model/Organization.java
@@ -1,5 +1,6 @@
 package pl.piomin.services.organization.model;
 
+import io.micronaut.serde.annotation.Serdeable;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -12,6 +13,7 @@
 @Setter
 @ToString
 @NoArgsConstructor
+@Serdeable
 public class Organization {
 
 	private Long id;

diff --git a/pom.xml b/pom.xml
@@ -5,9 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.micronaut</groupId>
+        <groupId>io.micronaut.platform</groupId>
         <artifactId>micronaut-parent</artifactId>
-        <version>3.10.4</version>
+        <version>4.4.1</version>
     </parent>
 
     <groupId>pl.piomin.services</groupId>
@@ -16,7 +16,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <micronaut.version>3.10.4</micronaut.version>
+        <micronaut.version>4.4.1</micronaut.version>
         <jdk.version>19</jdk.version>
         <release.version>${jdk.version}</release.version>
         <sonar.projectKey>piomin_sample-micronaut-microservices</sonar.projectKey>
@@ -31,17 +31,17 @@
         <module>organization-service</module>
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.micronaut</groupId>
-                <artifactId>micronaut-bom</artifactId>
-                <version>${micronaut.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+<!--    <dependencyManagement>-->
+<!--        <dependencies>-->
+<!--            <dependency>-->
+<!--                <groupId>io.micronaut</groupId>-->
+<!--                <artifactId>micronaut-bom</artifactId>-->
+<!--                <version>${micronaut.version}</version>-->
+<!--                <type>pom</type>-->
+<!--                <scope>import</scope>-->
+<!--            </dependency>-->
+<!--        </dependencies>-->
+<!--    </dependencyManagement>-->
 
     <build>
         <plugins>