Refactored DTOs to use Java records

.github/workflows/master.yml

@@ -54,7 +54,7 @@ jobs:
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           platforms: linux/amd64,linux/arm64

.github/workflows/re-release.yml

@@ -62,7 +62,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

.github/workflows/release.yml

@@ -49,7 +49,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

src/main/java/com/github/switcherapi/ac/controller/SwitcherRelayController.java

@@ -51,21 +51,21 @@ public ResponseEntity<Object> verify() {
 	@PostMapping(value = "/create")
 	public ResponseEntity<ResponseRelayDTO> loadAccount(@RequestBody RequestRelayDTO request) {
 		try {
-			accountService.createAccount(request.getValue());
+			accountService.createAccount(request.value());
 			return ResponseEntity.ok(ResponseRelayDTO.create(true));
 		} catch (Exception e) {
-			return ResponseEntity.status(500).body(ResponseRelayDTO.create(false).withMessage(e.getMessage()));
+			return ResponseEntity.status(500).body(ResponseRelayDTO.fail(e.getMessage()));
 		}
 	}
 
 	@Operation(summary = "Remove existing account from Switcher AC")
 	@PostMapping(value = "/remove")
 	public ResponseEntity<ResponseRelayDTO> removeAccount(@RequestBody RequestRelayDTO request) {
 		try {
-			accountService.deleteAccount(request.getValue());
+			accountService.deleteAccount(request.value());
 			return ResponseEntity.ok(ResponseRelayDTO.create(true));
 		} catch (Exception e) {
-			return ResponseEntity.status(500).body(ResponseRelayDTO.create(false).withMessage(e.getMessage()));
+			return ResponseEntity.status(500).body(ResponseRelayDTO.fail(e.getMessage()));
 		}
 	}
 
@@ -80,18 +80,18 @@ public ResponseEntity<ResponseRelayDTO> limiter(@RequestParam String value) {
 
 			return ResponseEntity.ok(validatorFactory.runValidator(request));
 		} catch (ResponseStatusException e) {
-			return ResponseEntity.status(e.getStatusCode()).body(ResponseRelayDTO.create(false).withMessage(e.getMessage()));
+			return ResponseEntity.status(e.getStatusCode()).body(ResponseRelayDTO.fail(e.getMessage()));
 		}
 	}
 
 	@Operation(summary = "Perform account validation given input value")
 	@PostMapping(value = "/validate")
 	public ResponseEntity<Object> validate(@RequestBody RequestRelayDTO request) {
 		try {
-			var featureRequest = gson.fromJson(request.getPayload(), FeaturePayload.class);
+			var featureRequest = gson.fromJson(request.payload(), FeaturePayload.class);
 			return ResponseEntity.ok(validatorService.execute(featureRequest));
 		} catch (ResponseStatusException e) {
-			return ResponseEntity.status(e.getStatusCode()).body(ResponseRelayDTO.create(false).withMessage(e.getMessage()));
+			return ResponseEntity.status(e.getStatusCode()).body(ResponseRelayDTO.fail(e.getMessage()));
 		}
 	}
 

src/main/java/com/github/switcherapi/ac/model/GitHubDetail.java

@@ -3,21 +3,12 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import lombok.Builder;
-import lombok.Data;
-
 @JsonIgnoreProperties(ignoreUnknown = true)
-@Data
-@Builder
-public class GitHubDetail {
-
-	private String id;
-
-	private String name;
-
-	private String login;
-
-	@JsonProperty("avatar_url")
-	private String avatarUrl;
-
+public record GitHubDetail(
+		String id,
+		String name,
+		String login,
+		@JsonProperty("avatar_url")
+		String avatarUrl
+) {
 }

src/main/java/com/github/switcherapi/ac/model/dto/AccountDTO.java

@@ -2,16 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import lombok.Data;
 
 @JsonInclude(Include.NON_NULL)
-@Data
-public class AccountDTO {
-
-    private String id;
-
-    private String adminId;
-
-    private PlanDTO plan;
-
+public record AccountDTO(
+		String id,
+		String adminId,
+		PlanDTO plan) {
 }

src/main/java/com/github/switcherapi/ac/model/dto/AdminDTO.java

@@ -3,14 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
-import lombok.Data;
-
 @JsonInclude(Include.NON_NULL)
-@Data
-public class AdminDTO {
-
-	private String id;
-
-	private String gitHubId;
-
+public record AdminDTO(
+		String id,
+		String gitHubId) {
 }

src/main/java/com/github/switcherapi/ac/model/dto/GitHubAuthDTO.java

@@ -3,16 +3,9 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
-import lombok.Data;
-
 @JsonInclude(Include.NON_NULL)
-@Data
-public class GitHubAuthDTO {
-
-	private AdminDTO admin;
-
-	private String token;
-
-	private String refreshToken;
-
+public record GitHubAuthDTO(
+		AdminDTO admin,
+		String token,
+		String refreshToken) {
 }

src/main/java/com/github/switcherapi/ac/model/dto/Metadata.java

@@ -6,8 +6,7 @@
 
 @Builder
 public record Metadata(
-        @JsonProperty("rate_limit")
-        @SerializedName("rate_limit")
-        int rateLimit
-) {
+		@JsonProperty("rate_limit")
+		@SerializedName("rate_limit")
+		int rateLimit) {
 }

src/main/java/com/github/switcherapi/ac/model/dto/PlanDTO.java

@@ -2,11 +2,13 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.github.switcherapi.ac.model.domain.Plan;
-import lombok.Generated;
+import com.github.switcherapi.ac.model.domain.PlanAttribute;
+
+import java.util.List;
 
-@Generated
 @JsonInclude(Include.NON_NULL)
-public class PlanDTO extends Plan {
-
+public record PlanDTO(
+		String id,
+		String name,
+		List<PlanAttribute> attributes) {
 }

src/main/java/com/github/switcherapi/ac/model/dto/RequestRelayDTO.java

@@ -3,14 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
-import lombok.Data;
-
 @JsonInclude(Include.NON_NULL)
-@Data
-public class RequestRelayDTO {
-
-	private String value;
-
-	private String payload;
-
+public record RequestRelayDTO(
+		String value,
+		String payload) {
 }

src/main/java/com/github/switcherapi/ac/model/dto/ResponseRelayDTO.java

@@ -2,37 +2,23 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.Generated;
-import lombok.NoArgsConstructor;
 
-@Generated
 @JsonInclude(Include.NON_NULL)
-@Data
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class ResponseRelayDTO {
-
-	private boolean result;
-
-	private String message;
-
-	private Metadata metadata;
+public record ResponseRelayDTO(
+		boolean result,
+		String message,
+		Metadata metadata) {
 
 	public static ResponseRelayDTO create(boolean result) {
-		var response = new ResponseRelayDTO();
-		response.setResult(result);
-		return response;
+		return new ResponseRelayDTO(result, null, null);
 	}
 
-	public ResponseRelayDTO withMessage(String message) {
-		this.message = message;
-		return this;
+	public static ResponseRelayDTO fail(String message) {
+		return new ResponseRelayDTO(false, message, null);
 	}
 
-	public ResponseRelayDTO withMetadata(Metadata metadata) {
-		this.metadata = metadata;
-		return this;
+	public static ResponseRelayDTO success(Metadata metadata) {
+		return new ResponseRelayDTO(true, null, metadata);
 	}
 
 }

src/main/java/com/github/switcherapi/ac/model/mapper/AccountMapper.java

@@ -4,17 +4,14 @@
 import com.github.switcherapi.ac.model.dto.AccountDTO;
 import com.github.switcherapi.ac.model.dto.PlanDTO;
 import lombok.AccessLevel;
-import lombok.Generated;
 import lombok.NoArgsConstructor;
 
-@Generated
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class AccountMapper {
 
 	public static AccountDTO createCopy(Account from) {
-		var to = DefaultMapper.createCopy(from, AccountDTO.class);
-		to.setPlan(DefaultMapper.createCopy(from.getPlan(), PlanDTO.class));
-		return to;
+		final var plan = new PlanDTO(from.getPlan().getId(), from.getPlan().getName(), from.getPlan().getAttributes());
+		return new AccountDTO(from.getId(), from.getAdminId(), plan);
 	}
 
 }

src/main/java/com/github/switcherapi/ac/model/mapper/DefaultMapper.java

@@ -1,7 +1,6 @@
 package com.github.switcherapi.ac.model.mapper;
 
 import com.github.switcherapi.client.exception.SwitcherException;
-import lombok.Generated;
 import lombok.experimental.UtilityClass;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanWrapper;
@@ -12,7 +11,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
-@Generated
 @UtilityClass
 public class DefaultMapper {
 

src/main/java/com/github/switcherapi/ac/model/mapper/GitHubAuthMapper.java

@@ -3,22 +3,16 @@
 import com.github.switcherapi.ac.model.domain.Admin;
 import com.github.switcherapi.ac.model.dto.AdminDTO;
 import com.github.switcherapi.ac.model.dto.GitHubAuthDTO;
-
 import lombok.AccessLevel;
-import lombok.Generated;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.tuple.Pair;
 
-@Generated
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class GitHubAuthMapper {
-	
+
 	public static GitHubAuthDTO createCopy(Admin from, Pair<String, String> tokens) {
-		var to = new GitHubAuthDTO();
-		to.setToken(tokens.getLeft());
-		to.setRefreshToken(tokens.getRight());
-		to.setAdmin(DefaultMapper.createCopy(from, AdminDTO.class));
-		return to;
+		final var admin = new AdminDTO(from.getId(), from.getGitHubId());
+		return new GitHubAuthDTO(admin, tokens.getLeft(), tokens.getRight());
 	}
 
 }