From 3fde35ac77467c98c0ec4e89ed6638a18d95035d Mon Sep 17 00:00:00 2001 From: Bruno Fernandes <39165280+burno1@users.noreply.github.com> Date: Sat, 5 Nov 2022 11:54:23 -0300 Subject: [PATCH] refactoring: Adding lombok to MVC pattern (#2188) * Refactor: Added lombok to data-transfer-object pattern * Refactor: Added lombok to data-transfer-object pattern * Fix: Reverting all-contributors changes * Fix: Fixing checkstyle for DTO * Fix: Fixing checkstyle for Product.java * Feature: Added lombok to MVC * Fix: Fix imports --- .../model/view/controller/Fatigue.java | 6 +-- .../model/view/controller/GiantModel.java | 43 +++++-------------- .../model/view/controller/Health.java | 6 +-- .../model/view/controller/Nourishment.java | 6 +-- 4 files changed, 20 insertions(+), 41 deletions(-) diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Fatigue.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Fatigue.java index 0cf9941ce..00cced240 100644 --- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Fatigue.java +++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Fatigue.java @@ -24,9 +24,12 @@ */ package com.iluwatar.model.view.controller; +import lombok.AllArgsConstructor; + /** * Fatigue enumeration. */ +@AllArgsConstructor public enum Fatigue { ALERT("alert"), TIRED("tired"), @@ -34,9 +37,6 @@ public enum Fatigue { private final String title; - Fatigue(String title) { - this.title = title; - } @Override public String toString() { diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantModel.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantModel.java index e6206e065..3de47cdcb 100644 --- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantModel.java +++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/GiantModel.java @@ -24,47 +24,26 @@ */ package com.iluwatar.model.view.controller; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + /** * GiantModel contains the giant data. */ +@Getter +@Setter +@Builder +@AllArgsConstructor +@NoArgsConstructor public class GiantModel { private Health health; private Fatigue fatigue; private Nourishment nourishment; - /** - * Instantiates a new GiantModel. - */ - public GiantModel(Health health, Fatigue fatigue, Nourishment nourishment) { - this.health = health; - this.fatigue = fatigue; - this.nourishment = nourishment; - } - - public Health getHealth() { - return health; - } - - public void setHealth(Health health) { - this.health = health; - } - - public Fatigue getFatigue() { - return fatigue; - } - - public void setFatigue(Fatigue fatigue) { - this.fatigue = fatigue; - } - - public Nourishment getNourishment() { - return nourishment; - } - - public void setNourishment(Nourishment nourishment) { - this.nourishment = nourishment; - } @Override public String toString() { diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Health.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Health.java index 75b50a348..0f54f5cd3 100644 --- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Health.java +++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Health.java @@ -24,9 +24,12 @@ */ package com.iluwatar.model.view.controller; +import lombok.AllArgsConstructor; + /** * Health enumeration. */ +@AllArgsConstructor public enum Health { HEALTHY("healthy"), WOUNDED("wounded"), @@ -34,9 +37,6 @@ public enum Health { private final String title; - Health(String title) { - this.title = title; - } @Override public String toString() { diff --git a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Nourishment.java b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Nourishment.java index e8ec91cf5..f08a9c5bc 100644 --- a/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Nourishment.java +++ b/model-view-controller/src/main/java/com/iluwatar/model/view/controller/Nourishment.java @@ -24,9 +24,12 @@ */ package com.iluwatar.model.view.controller; +import lombok.AllArgsConstructor; + /** * Nourishment enumeration. */ +@AllArgsConstructor public enum Nourishment { SATURATED("saturated"), HUNGRY("hungry"), @@ -34,9 +37,6 @@ public enum Nourishment { private final String title; - Nourishment(String title) { - this.title = title; - } @Override public String toString() {