refactor: Remove @builder since we only create a new instance once

inspectIT · Aug 29, 2024 · 8eaae21 · 8eaae21
1 parent bf183ea
commit 8eaae21
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 27 deletions.
diff --git a/backend/src/main/java/rocks/inspectit/gepard/agentmanager/agent/model/Agent.java b/backend/src/main/java/rocks/inspectit/gepard/agentmanager/agent/model/Agent.java
@@ -7,7 +7,6 @@
 
 /** Represents an agent which is connected to the config server. */
 @AllArgsConstructor
-@Builder
 @ToString
 @Getter
 public class Agent {

diff --git a/backend/src/main/java/rocks/inspectit/gepard/agentmanager/connection/model/Connection.java b/backend/src/main/java/rocks/inspectit/gepard/agentmanager/connection/model/Connection.java
@@ -10,7 +10,6 @@
  * Represents a connected agent. It is an internal data structure and not exposed to the API. Acts
  * as Aggregate Root.
  */
-@Builder
 @AllArgsConstructor
 @NoArgsConstructor
 @Getter

diff --git a/...src/main/java/rocks/inspectit/gepard/agentmanager/connection/model/dto/ConnectionDto.java b/...src/main/java/rocks/inspectit/gepard/agentmanager/connection/model/dto/ConnectionDto.java
@@ -4,11 +4,9 @@
 import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.UUID;
-import lombok.Builder;
 import rocks.inspectit.gepard.agentmanager.connection.model.Connection;
 
 /** Represents a connection response. */
-@Builder
 public record ConnectionDto(
     @NotNull(message = "ID missing.") UUID id,
     @NotNull(message = "Registration Time missing.") LocalDateTime registrationTime,
@@ -20,15 +18,14 @@ public record ConnectionDto(
     @NotNull(message = "Java Version missing.") String javaVersion) {
 
   public static ConnectionDto fromConnection(Connection connection) {
-    return ConnectionDto.builder()
-        .id(connection.getId())
-        .registrationTime(connection.getRegistrationTime())
-        .serviceName(connection.getAgent().getServiceName())
-        .gepardVersion(connection.getAgent().getGepardVersion())
-        .otelVersion(connection.getAgent().getOtelVersion())
-        .pid(connection.getAgent().getPid())
-        .startTime(connection.getAgent().getStartTime().toEpochMilli())
-        .javaVersion(connection.getAgent().getJavaVersion())
-        .build();
+    return new ConnectionDto(
+        connection.getId(),
+        connection.getRegistrationTime(),
+        connection.getAgent().getServiceName(),
+        connection.getAgent().getGepardVersion(),
+        connection.getAgent().getOtelVersion(),
+        connection.getAgent().getPid(),
+        connection.getAgent().getStartTime().toEpochMilli(),
+        connection.getAgent().getJavaVersion());
   }
 }
diff --git a/...ava/rocks/inspectit/gepard/agentmanager/connection/model/dto/CreateConnectionRequest.java b/...ava/rocks/inspectit/gepard/agentmanager/connection/model/dto/CreateConnectionRequest.java
@@ -18,18 +18,15 @@ public record CreateConnectionRequest(
     @NotNull(message = "Java Version missing.") String javaVersion) {
 
   public static Connection toConnection(CreateConnectionRequest createConnectionRequest) {
-    return Connection.builder()
-        .id(UUID.randomUUID())
-        .registrationTime(LocalDateTime.now())
-        .agent(
-            Agent.builder()
-                .gepardVersion(createConnectionRequest.gepardVersion)
-                .javaVersion(createConnectionRequest.javaVersion)
-                .otelVersion(createConnectionRequest.otelVersion)
-                .pid(createConnectionRequest.pid)
-                .serviceName(createConnectionRequest.serviceName)
-                .startTime(Instant.ofEpochMilli(createConnectionRequest.startTime))
-                .build())
-        .build();
+    return new Connection(
+        UUID.randomUUID(),
+        LocalDateTime.now(),
+        new Agent(
+            createConnectionRequest.serviceName,
+            createConnectionRequest.pid,
+            createConnectionRequest.gepardVersion,
+            createConnectionRequest.otelVersion,
+            Instant.ofEpochMilli(createConnectionRequest.startTime),
+            createConnectionRequest.javaVersion));
   }
 }